From 98544382dba4f25a03e72cfa786d950c591ff305 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 22 Sep 2020 17:06:08 -0700 Subject: [PATCH] Added LoginKey support to emails. --- emails/account-check.html | 4 +- emails/account-check.txt | 4 +- emails/account-invite.html | 2 +- emails/account-invite.txt | 2 +- emails/account-reset.html | 4 +- emails/account-reset.txt | 4 +- emails/mesh-invite.txt | 4 +- emails/translations/account-check_cs.html | 4 +- emails/translations/account-check_cs.txt | 4 +- emails/translations/account-check_de.html | 4 +- emails/translations/account-check_de.txt | 4 +- emails/translations/account-check_es.html | 4 +- emails/translations/account-check_es.txt | 4 +- emails/translations/account-check_fi.html | 4 +- emails/translations/account-check_fi.txt | 4 +- emails/translations/account-check_fr.html | 4 +- emails/translations/account-check_fr.txt | 4 +- emails/translations/account-check_hi.html | 4 +- emails/translations/account-check_hi.txt | 4 +- emails/translations/account-check_ja.html | 4 +- emails/translations/account-check_ja.txt | 4 +- emails/translations/account-check_ko.html | 4 +- emails/translations/account-check_ko.txt | 4 +- emails/translations/account-check_nl.html | 4 +- emails/translations/account-check_nl.txt | 4 +- emails/translations/account-check_pt.html | 4 +- emails/translations/account-check_pt.txt | 4 +- emails/translations/account-check_ru.html | 4 +- emails/translations/account-check_ru.txt | 4 +- emails/translations/account-check_tr.html | 4 +- emails/translations/account-check_tr.txt | 4 +- emails/translations/account-check_zh-chs.html | 4 +- emails/translations/account-check_zh-chs.txt | 4 +- emails/translations/account-check_zh-cht.html | 4 +- emails/translations/account-check_zh-cht.txt | 4 +- emails/translations/account-invite_cs.html | 2 +- emails/translations/account-invite_cs.txt | 2 +- emails/translations/account-invite_de.html | 2 +- emails/translations/account-invite_de.txt | 2 +- emails/translations/account-invite_es.html | 2 +- emails/translations/account-invite_es.txt | 2 +- emails/translations/account-invite_fi.html | 2 +- emails/translations/account-invite_fi.txt | 2 +- emails/translations/account-invite_fr.html | 2 +- emails/translations/account-invite_fr.txt | 2 +- emails/translations/account-invite_hi.html | 2 +- emails/translations/account-invite_hi.txt | 2 +- emails/translations/account-invite_ja.html | 2 +- emails/translations/account-invite_ja.txt | 2 +- emails/translations/account-invite_ko.html | 2 +- emails/translations/account-invite_ko.txt | 2 +- emails/translations/account-invite_nl.html | 2 +- emails/translations/account-invite_nl.txt | 2 +- emails/translations/account-invite_pt.html | 2 +- emails/translations/account-invite_pt.txt | 2 +- emails/translations/account-invite_ru.html | 2 +- emails/translations/account-invite_ru.txt | 2 +- emails/translations/account-invite_tr.html | 2 +- emails/translations/account-invite_tr.txt | 2 +- .../translations/account-invite_zh-chs.html | 2 +- emails/translations/account-invite_zh-chs.txt | 2 +- .../translations/account-invite_zh-cht.html | 2 +- emails/translations/account-invite_zh-cht.txt | 2 +- emails/translations/account-reset_cs.html | 4 +- emails/translations/account-reset_cs.txt | 4 +- emails/translations/account-reset_de.html | 4 +- emails/translations/account-reset_de.txt | 4 +- emails/translations/account-reset_es.html | 4 +- emails/translations/account-reset_es.txt | 4 +- emails/translations/account-reset_fi.html | 4 +- emails/translations/account-reset_fi.txt | 4 +- emails/translations/account-reset_fr.html | 4 +- emails/translations/account-reset_fr.txt | 4 +- emails/translations/account-reset_hi.html | 4 +- emails/translations/account-reset_hi.txt | 4 +- emails/translations/account-reset_ja.html | 4 +- emails/translations/account-reset_ja.txt | 4 +- emails/translations/account-reset_ko.html | 4 +- emails/translations/account-reset_ko.txt | 4 +- emails/translations/account-reset_nl.html | 4 +- emails/translations/account-reset_nl.txt | 4 +- emails/translations/account-reset_pt.html | 4 +- emails/translations/account-reset_pt.txt | 4 +- emails/translations/account-reset_ru.html | 4 +- emails/translations/account-reset_ru.txt | 4 +- emails/translations/account-reset_tr.html | 4 +- emails/translations/account-reset_tr.txt | 4 +- emails/translations/account-reset_zh-chs.html | 4 +- emails/translations/account-reset_zh-chs.txt | 4 +- emails/translations/account-reset_zh-cht.html | 4 +- emails/translations/account-reset_zh-cht.txt | 4 +- emails/translations/mesh-invite_cs.txt | 4 +- emails/translations/mesh-invite_de.txt | 4 +- emails/translations/mesh-invite_es.txt | 4 +- emails/translations/mesh-invite_fi.txt | 4 +- emails/translations/mesh-invite_fr.txt | 4 +- emails/translations/mesh-invite_hi.txt | 4 +- emails/translations/mesh-invite_ja.txt | 4 +- emails/translations/mesh-invite_ko.txt | 4 +- emails/translations/mesh-invite_nl.txt | 4 +- emails/translations/mesh-invite_pt.txt | 4 +- emails/translations/mesh-invite_ru.txt | 4 +- emails/translations/mesh-invite_tr.txt | 4 +- emails/translations/mesh-invite_zh-chs.txt | 4 +- emails/translations/mesh-invite_zh-cht.txt | 4 +- meshmail.js | 15 +++++--- public/scripts/common-0.0.1-min.js | 2 +- public/scripts/common-0.0.1.js | 16 +++----- translate/translate.json | 37 +++++++++++++------ views/message.handlebars | 18 ++++++++- views/message2.handlebars | 21 +++++++++-- webserver.js | 14 +++---- 112 files changed, 265 insertions(+), 218 deletions(-) diff --git a/emails/account-check.html b/emails/account-check.html index c04a5bcd..959e3663 100644 --- a/emails/account-check.html +++ b/emails/account-check.html @@ -7,9 +7,9 @@ -

Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting email verification, click on the following link to complete the process.

+

Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting email verification, click on the following link to complete the process.

- Click here to verify your e-mail address. + Click here to verify your e-mail address.

If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-check.txt b/emails/account-check.txt index b90c0d2f..5ad23547 100644 --- a/emails/account-check.txt +++ b/emails/account-check.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Email Verification -Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-invite.html b/emails/account-invite.html index be5ca419..f402e5a7 100644 --- a/emails/account-invite.html +++ b/emails/account-invite.html @@ -7,7 +7,7 @@ -

An account was created for you on server [[[SERVERNAME]]], you can access it now with:

+

An account was created for you on server [[[SERVERNAME]]], you can access it now with:

   Username: [[[ACCOUNTNAME]]]
   Password: [[[PASSWORD]]] diff --git a/emails/account-invite.txt b/emails/account-invite.txt index 3061a670..bfb0563d 100644 --- a/emails/account-invite.txt +++ b/emails/account-invite.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Account Invitation -An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Best regards, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/account-reset.html b/emails/account-reset.html index df133a67..6b8d7a6a 100644 --- a/emails/account-reset.html +++ b/emails/account-reset.html @@ -7,9 +7,9 @@ -

Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting an account password reset, click on the following link to complete the process.

+

Hi [[[USERNAME]]], [[[SERVERNAME]]] is requesting an account password reset, click on the following link to complete the process.

- Click here to reset your account password. + Click here to reset your account password.

If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/account-reset.txt b/emails/account-reset.txt index 8960967d..44f02b30 100644 --- a/emails/account-reset.txt +++ b/emails/account-reset.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Account Reset -Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) is requesting an account password reset. Nagivate to the following link to complete the process: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ If you did not initiate this request, please ignore this mail. \ No newline at end of file diff --git a/emails/mesh-invite.txt b/emails/mesh-invite.txt index d8c222c2..ade301dc 100644 --- a/emails/mesh-invite.txt +++ b/emails/mesh-invite.txt @@ -2,7 +2,7 @@ ~ Hello [[[NAME]]], ~ -User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/) is requesting you install software to start the remote control session. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Message: [[[MSG]]] @@ -27,7 +27,7 @@ For Linux, cut & paste the following in a terminal to install the agent: ~ ~ ~ -To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]] and follow the instructions. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ If you did not initiate this request, please ignore this mail. ~ diff --git a/emails/translations/account-check_cs.html b/emails/translations/account-check_cs.html index 1a5d3267..64112c51 100644 --- a/emails/translations/account-check_cs.html +++ b/emails/translations/account-check_cs.html @@ -7,9 +7,9 @@ -

Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.

+

Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje ověření e-mailem a dokončete proces kliknutím na následující odkaz.

- Kliknutím sem ověřte svou e-mailovou adresu. + Kliknutím sem ověřte svou e-mailovou adresu.

Pokud jste tento požadavek nezačali, ignorujte tento e-mail. \ No newline at end of file diff --git a/emails/translations/account-check_cs.txt b/emails/translations/account-check_cs.txt index 3079684a..c1dcfba6 100644 --- a/emails/translations/account-check_cs.txt +++ b/emails/translations/account-check_cs.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Ověření e-mailem -Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) provádí ověření e-mailem. Chcete-li proces dokončit, přejděte na následující odkaz: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Pokud jste tento požadavek nezačali, ignorujte tento e-mail. \ No newline at end of file diff --git a/emails/translations/account-check_de.html b/emails/translations/account-check_de.html index f4a47314..ec9a7d2e 100644 --- a/emails/translations/account-check_de.html +++ b/emails/translations/account-check_de.html @@ -7,9 +7,9 @@ -

Hallo [[[USERNAME]]], [[[SERVERNAME]]] Wenn Sie eine E-Mail-Bestätigung anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.

+

Hallo [[[USERNAME]]], [[[SERVERNAME]]] Wenn Sie eine E-Mail-Bestätigung anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.

- Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen. + Klicken Sie hier, um Ihre E-Mail-Adresse zu bestätigen.

Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte. \ No newline at end of file diff --git a/emails/translations/account-check_de.txt b/emails/translations/account-check_de.txt index 990892ef..ece2fdf6 100644 --- a/emails/translations/account-check_de.txt +++ b/emails/translations/account-check_de.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - E-Mail-Überprüfung -Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) führt eine E-Mail-Überprüfung durch. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte. \ No newline at end of file diff --git a/emails/translations/account-check_es.html b/emails/translations/account-check_es.html index ec604668..993d0ab8 100644 --- a/emails/translations/account-check_es.html +++ b/emails/translations/account-check_es.html @@ -7,9 +7,9 @@ -

Hola [[[USERNAME]]], [[[SERVERNAME]]] solicita la verificación por correo electrónico, haga clic en el siguiente enlace para completar el proceso.

+

Hola [[[USERNAME]]], [[[SERVERNAME]]] solicita la verificación por correo electrónico, haga clic en el siguiente enlace para completar el proceso.

- Haga clic aquí para verificar su dirección de correo electrónico. + Haga clic aquí para verificar su dirección de correo electrónico.

Si Ud. no inicio este requerimiento, por favor ignore este correo. \ No newline at end of file diff --git a/emails/translations/account-check_es.txt b/emails/translations/account-check_es.txt index e0dd3ed4..dc61d732 100644 --- a/emails/translations/account-check_es.txt +++ b/emails/translations/account-check_es.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Verificación de Correo Electrónico -Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) esta realizando una comprobación del correo electrónico. Navegue al siguiente enlace para completar el proceso: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Si Ud. no inicio este requerimiento, por favor ignore este correo. \ No newline at end of file diff --git a/emails/translations/account-check_fi.html b/emails/translations/account-check_fi.html index 21fd1d62..8f7caf7e 100644 --- a/emails/translations/account-check_fi.html +++ b/emails/translations/account-check_fi.html @@ -7,9 +7,9 @@ -

Moi [[[USERNAME]]], [[[SERVERNAME]]] pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.

+

Moi [[[USERNAME]]], [[[SERVERNAME]]] pyytää sähköpostitse vahvistusta, suorita prosessi napsauttamalla seuraavaa linkkiä.

- Napsauta tätä vahvistaaksesi sähköpostiosoitteesi. + Napsauta tätä vahvistaaksesi sähköpostiosoitteesi.

Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin. \ No newline at end of file diff --git a/emails/translations/account-check_fi.txt b/emails/translations/account-check_fi.txt index 14b426eb..9ebdfc0a 100644 --- a/emails/translations/account-check_fi.txt +++ b/emails/translations/account-check_fi.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Sähköpostivarmistus -Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) tarkistaa sähköpostiosoitetta. Seuraa linkkiä prosessin loppuun saattamiseksi: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin. \ No newline at end of file diff --git a/emails/translations/account-check_fr.html b/emails/translations/account-check_fr.html index 25d6da9a..82d7beff 100644 --- a/emails/translations/account-check_fr.html +++ b/emails/translations/account-check_fr.html @@ -7,9 +7,9 @@ -

Bonjour [[[USERNAME]]], [[[SERVERNAME]]] demande une vérification par e-mail, cliquez sur le lien suivant pour terminer le processus.

+

Bonjour [[[USERNAME]]], [[[SERVERNAME]]] demande une vérification par e-mail, cliquez sur le lien suivant pour terminer le processus.

- Cliquez ici pour vérifier votre adresse e-mail. + Cliquez ici pour vérifier votre adresse e-mail.

Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier. \ No newline at end of file diff --git a/emails/translations/account-check_fr.txt b/emails/translations/account-check_fr.txt index ec4f641e..da39ae6d 100644 --- a/emails/translations/account-check_fr.txt +++ b/emails/translations/account-check_fr.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Vérification E-mail -Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) effectue une vérification par e-mail. Accédez au lien suivant pour terminer le processus: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier. \ No newline at end of file diff --git a/emails/translations/account-check_hi.html b/emails/translations/account-check_hi.html index 5264aa4a..e380c721 100644 --- a/emails/translations/account-check_hi.html +++ b/emails/translations/account-check_hi.html @@ -7,9 +7,9 @@ -

हाय [[[USERNAME]]], [[[SERVERNAME]]] ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।

+

हाय [[[USERNAME]]], [[[SERVERNAME]]] ईमेल सत्यापन का अनुरोध कर रहा है, प्रक्रिया को पूरा करने के लिए निम्न लिंक पर क्लिक करें।

- अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें। + अपना ई-मेल पता सत्यापित करने के लिए यहां क्लिक करें।

यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें। \ No newline at end of file diff --git a/emails/translations/account-check_hi.txt b/emails/translations/account-check_hi.txt index e4e4c2bc..2ea6380c 100644 --- a/emails/translations/account-check_hi.txt +++ b/emails/translations/account-check_hi.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - ईमेल सत्यापन -हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] ई-मेल सत्यापन कर रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें। \ No newline at end of file diff --git a/emails/translations/account-check_ja.html b/emails/translations/account-check_ja.html index 96138d50..943e73e3 100644 --- a/emails/translations/account-check_ja.html +++ b/emails/translations/account-check_ja.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]]様 [[[SERVERNAME]]] がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。

+

[[[USERNAME]]]様 [[[SERVERNAME]]] がメールの確認をリクエストしている場合は、次のリンクをクリックしてプロセスを完了してください。

- ここをクリックして、電子メールアドレスを確認してください。 + ここをクリックして、電子メールアドレスを確認してください。

このリクエストを開始していない場合は、このメールを無視してください。 \ No newline at end of file diff --git a/emails/translations/account-check_ja.txt b/emails/translations/account-check_ja.txt index 64c9017b..9630200c 100644 --- a/emails/translations/account-check_ja.txt +++ b/emails/translations/account-check_ja.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - メールの確認 -こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）は電子メールの検証を実行しています。プロセスを完了するには、次のリンクに移動します。 +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ このリクエストを開始していない場合は、このメールを無視してください。 \ No newline at end of file diff --git a/emails/translations/account-check_ko.html b/emails/translations/account-check_ko.html index 31db94f8..fe533bb5 100644 --- a/emails/translations/account-check_ko.html +++ b/emails/translations/account-check_ko.html @@ -7,9 +7,9 @@ -

안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.

+

안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] 이메일 검증을 요구하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.

- 이메일 주소를 검증하려면 여기를 클릭하십시오. + 이메일 주소를 검증하려면 여기를 클릭하십시오.

이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오. \ No newline at end of file diff --git a/emails/translations/account-check_ko.txt b/emails/translations/account-check_ko.txt index 2212cc96..3f0a085c 100644 --- a/emails/translations/account-check_ko.txt +++ b/emails/translations/account-check_ko.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Email 인증 -안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 이메일 검증을 위해 실행됩니다. 다음 링크로 이동하여 과정을 완료하십시오 : +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오. \ No newline at end of file diff --git a/emails/translations/account-check_nl.html b/emails/translations/account-check_nl.html index bb6057f1..6b193429 100644 --- a/emails/translations/account-check_nl.html +++ b/emails/translations/account-check_nl.html @@ -7,9 +7,9 @@ -

Hallo [[[USERNAME]]], [[[SERVERNAME]]] vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.

+

Hallo [[[USERNAME]]], [[[SERVERNAME]]] vraagt om e-mailverificatie, klik op de volgende link om het proces te voltooien.

- Klik hier om uw e-mailadres te verifiëren. + Klik hier om uw e-mailadres te verifiëren.

Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren. \ No newline at end of file diff --git a/emails/translations/account-check_nl.txt b/emails/translations/account-check_nl.txt index 5b4fcc75..d275fd6d 100644 --- a/emails/translations/account-check_nl.txt +++ b/emails/translations/account-check_nl.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - E-mail Verificatie -Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) voert een e-mailverificatie uit. Ga naar de volgende link om het proces te voltooien: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren. \ No newline at end of file diff --git a/emails/translations/account-check_pt.html b/emails/translations/account-check_pt.html index 8dcb4d56..fef12eec 100644 --- a/emails/translations/account-check_pt.html +++ b/emails/translations/account-check_pt.html @@ -7,9 +7,9 @@ -

Olá [[[NOME DE USUÁRIO]]], [[[SERVERNAME]]] está solicitando verificação de e-mail, clique no link a seguir para concluir o processo.

+

Olá [[[NOME DE USUÁRIO]]], [[[SERVERNAME]]] está solicitando verificação de e-mail, clique no link a seguir para concluir o processo.

- Clique aqui para verificar seu endereço de e-mail. + Clique aqui para verificar seu endereço de e-mail.

Se você não iniciou esta solicitação, ignore este e-mail. \ No newline at end of file diff --git a/emails/translations/account-check_pt.txt b/emails/translations/account-check_pt.txt index 866156f0..602e3033 100644 --- a/emails/translations/account-check_pt.txt +++ b/emails/translations/account-check_pt.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Verificação de Email -Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está realizando uma verificação de e-mail. Acesse o seguinte link para concluir o processo: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Se você não iniciou esta solicitação, ignore este e-mail. \ No newline at end of file diff --git a/emails/translations/account-check_ru.html b/emails/translations/account-check_ru.html index 37fdac4d..875dacac 100644 --- a/emails/translations/account-check_ru.html +++ b/emails/translations/account-check_ru.html @@ -7,9 +7,9 @@ -

Привет [[[USERNAME]]], [[[SERVERNAME]]] запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.

+

Привет [[[USERNAME]]], [[[SERVERNAME]]] запрашивает подтверждение по электронной почте, нажмите на следующую ссылку, чтобы завершить процесс.

- Нажмите здесь, чтобы подтвердить свой адрес электронной почты. + Нажмите здесь, чтобы подтвердить свой адрес электронной почты.

Если вы не инициировали этот запрос, игнорируйте это письмо. \ No newline at end of file diff --git a/emails/translations/account-check_ru.txt b/emails/translations/account-check_ru.txt index b61b5aee..9f37e20e 100644 --- a/emails/translations/account-check_ru.txt +++ b/emails/translations/account-check_ru.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - подтверждение по электронной почте -Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) выполняет проверку электронной почты. Для завершения процесса перейдите по следующей ссылке: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Если вы не инициировали этот запрос, игнорируйте это письмо. \ No newline at end of file diff --git a/emails/translations/account-check_tr.html b/emails/translations/account-check_tr.html index b48fa52f..eb24fd9f 100644 --- a/emails/translations/account-check_tr.html +++ b/emails/translations/account-check_tr.html @@ -7,9 +7,9 @@ -

Merhaba [[[USERNAME]]], [[[SERVERNAME]]] e-posta doğrulaması istiyorsa, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.

+

Merhaba [[[USERNAME]]], [[[SERVERNAME]]] e-posta doğrulaması istiyorsa, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.

- E-posta adresinizi doğrulamak için burayı tıklayın. + E-posta adresinizi doğrulamak için burayı tıklayın.

Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın. \ No newline at end of file diff --git a/emails/translations/account-check_tr.txt b/emails/translations/account-check_tr.txt index d6254a85..b4ba2547 100644 --- a/emails/translations/account-check_tr.txt +++ b/emails/translations/account-check_tr.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - E-posta Doğrulaması -Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir e-posta doğrulaması yapıyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın. \ No newline at end of file diff --git a/emails/translations/account-check_zh-chs.html b/emails/translations/account-check_zh-chs.html index 7d821e81..ed60e9f1 100644 --- a/emails/translations/account-check_zh-chs.html +++ b/emails/translations/account-check_zh-chs.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]，你好， [[[SERVERNAME]]] 正在请求电邮验证，请单击以下连结以完成该过程。

+

[[[USERNAME]]，你好， [[[SERVERNAME]]] 正在请求电邮验证，请单击以下连结以完成该过程。

- 单击此处以验证您的电邮地址。 + 单击此处以验证您的电邮地址。

如果您没有发起此请求，请不理此邮件。 \ No newline at end of file diff --git a/emails/translations/account-check_zh-chs.txt b/emails/translations/account-check_zh-chs.txt index 60e2862b..a231cb58 100644 --- a/emails/translations/account-check_zh-chs.txt +++ b/emails/translations/account-check_zh-chs.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]]-电邮验证 -嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在执行电邮验证。导航至以下连结以完成该过程： +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 如果您没有发起此请求，请不理此邮件。 \ No newline at end of file diff --git a/emails/translations/account-check_zh-cht.html b/emails/translations/account-check_zh-cht.html index 6f3bc9e9..4d7020a0 100644 --- a/emails/translations/account-check_zh-cht.html +++ b/emails/translations/account-check_zh-cht.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]，你好， [[[SERVERNAME]] 正在請求電郵驗證，請單擊以下鏈結以完成該過程。

+

[[[USERNAME]]，你好， [[[SERVERNAME]] 正在請求電郵驗證，請單擊以下鏈結以完成該過程。

- 單擊此處以驗證你的電郵地址。 + 單擊此處以驗證你的電郵地址。

如果你沒有發起此請求，請不理此電郵。 \ No newline at end of file diff --git a/emails/translations/account-check_zh-cht.txt b/emails/translations/account-check_zh-cht.txt index f0a78d42..a448c960 100644 --- a/emails/translations/account-check_zh-cht.txt +++ b/emails/translations/account-check_zh-cht.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]]-電郵驗證 -嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程： +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 如果你沒有發起此請求，請不理此電郵。 \ No newline at end of file diff --git a/emails/translations/account-invite_cs.html b/emails/translations/account-invite_cs.html index f889e5c3..056a73b6 100644 --- a/emails/translations/account-invite_cs.html +++ b/emails/translations/account-invite_cs.html @@ -7,7 +7,7 @@ -

Účet byl pro vás vytvořen na serveru [[[SERVERNAME]]], nyní k němu máte přístup:

+

Účet byl pro vás vytvořen na serveru [[[SERVERNAME]]], nyní k němu máte přístup:

   Uživatelské jméno: [[[ACCOUNTNAME]]]
   Heslo: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_cs.txt b/emails/translations/account-invite_cs.txt index a2bdf343..5d066577 100644 --- a/emails/translations/account-invite_cs.txt +++ b/emails/translations/account-invite_cs.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Pozvánka na účet -Účet pro vás byl vytvořen na serveru [[[SERVERNAME]]] ([[[[SERVERURL]]] /), nyní k němu můžete přistupovat pomocí uživatelského jména „[[[[ACCOUNTNAME]]]“ “a hesla„ [[[HESLO]] ]] ". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ S pozdravem, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_de.html b/emails/translations/account-invite_de.html index 5556e1d0..563b0ffb 100644 --- a/emails/translations/account-invite_de.html +++ b/emails/translations/account-invite_de.html @@ -7,7 +7,7 @@ -

Auf dem Server wurde ein Konto für Sie erstellt [[[SERVERNAME]]]können Sie jetzt darauf zugreifen mit:

+

Auf dem Server wurde ein Konto für Sie erstellt [[[SERVERNAME]]]können Sie jetzt darauf zugreifen mit:

   Benutzername: [[[ACCOUNTNAME]]]
   Passwort: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_de.txt b/emails/translations/account-invite_de.txt index f938f9c6..4e7d5294 100644 --- a/emails/translations/account-invite_de.txt +++ b/emails/translations/account-invite_de.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Kontoeinladung -Auf dem Server [[[SERVERNAME]]] ([[[SERVERURL]]]/) wurde ein Konto für Sie erstellt, Sie können ab sofort mit dem Benutzernamen "[[[ACCOUNTNAME]]]" und dem Passwort "[[[PASSWORD]]]" darauf zugreifen. +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Freundliche Grüße, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_es.html b/emails/translations/account-invite_es.html index 065e9576..a18da2e7 100644 --- a/emails/translations/account-invite_es.html +++ b/emails/translations/account-invite_es.html @@ -7,7 +7,7 @@ -

Una cuenta ha sido creada en su servidor [[[SERVERNAME]]], ahora puede acceder con:

+

Una cuenta ha sido creada en su servidor [[[SERVERNAME]]], ahora puede acceder con:

   Nombre de usuario: [[[ACCOUNTNAME]]]
   Contraseña: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_es.txt b/emails/translations/account-invite_es.txt index 13a3a511..9e753efd 100644 --- a/emails/translations/account-invite_es.txt +++ b/emails/translations/account-invite_es.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Invitación de Cuenta -Una cuenta ha sido creada en su servidor [[[SERVERNAME]]] ([[[SERVERURL]]]/), ahora puede acceder con el usuario "[[[ACCOUNTNAME]]]" y la contraseña "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Atentamente, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_fi.html b/emails/translations/account-invite_fi.html index 77698173..b7798606 100644 --- a/emails/translations/account-invite_fi.html +++ b/emails/translations/account-invite_fi.html @@ -7,7 +7,7 @@ -

Sinulle on luotu tili palvelimelle [[[SERVERNAME]]], voit käyttää sitä nyt:

+

Sinulle on luotu tili palvelimelle [[[SERVERNAME]]], voit käyttää sitä nyt:

   Käyttäjätunnus: [[[ACCOUNTNAME]]]
   Salasana: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_fi.txt b/emails/translations/account-invite_fi.txt index e7dd0ffc..c5fb7e22 100644 --- a/emails/translations/account-invite_fi.txt +++ b/emails/translations/account-invite_fi.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Tili kutsu -Sinulle on luotu tili palvelimelle [[[SERVERNAME]]] ([[[SERVERURL]]]/), voit käyttää sitä nyt käyttäjätunnuksella "[[[ACCOUNTNAME]]]" and salasanalla "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Ystävällisin terveisin, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_fr.html b/emails/translations/account-invite_fr.html index 8f4061de..177e1118 100644 --- a/emails/translations/account-invite_fr.html +++ b/emails/translations/account-invite_fr.html @@ -7,7 +7,7 @@ -

Un compte a été créé pour vous sur le serveur [[[SERVERNAME]]], vous pouvez y accéder maintenant avec:

+

Un compte a été créé pour vous sur le serveur [[[SERVERNAME]]], vous pouvez y accéder maintenant avec:

   Nom d'utilisateur: [[[ACCOUNTNAME]]]
   Mot de passe: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_fr.txt b/emails/translations/account-invite_fr.txt index fd52ed79..57531cf2 100644 --- a/emails/translations/account-invite_fr.txt +++ b/emails/translations/account-invite_fr.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Invitation au compte -Un compte a été créé pour vous sur le serveur [[[[SERVERNAME]]] ([[[SERVERURL]]] /), vous pouvez y accéder maintenant avec le nom d'utilisateur "[[[ACCOUNTNAME]]]" et le mot de passe "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Meilleures salutations, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_hi.html b/emails/translations/account-invite_hi.html index d4167418..b1d529f7 100644 --- a/emails/translations/account-invite_hi.html +++ b/emails/translations/account-invite_hi.html @@ -7,7 +7,7 @@ -

सर्वर पर आपके लिए एक खाता बनाया गया था [[[SERVERNAME]]], आप इसे अभी एक्सेस कर सकते हैं:

+

सर्वर पर आपके लिए एक खाता बनाया गया था [[[SERVERNAME]]], आप इसे अभी एक्सेस कर सकते हैं:

   उपयोगकर्ता नाम: [[[ACCOUNTNAME]]]
   कुंजिका: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_hi.txt b/emails/translations/account-invite_hi.txt index ae8a35d5..db26edbb 100644 --- a/emails/translations/account-invite_hi.txt +++ b/emails/translations/account-invite_hi.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - खाता निमंत्रण -सर्वर [[[SERVERNAME]]] ([[[SERVERURL]]] /) पर आपके लिए एक खाता बनाया गया था, आप इसे अब उपयोगकर्ता नाम "[[[ACCOUNTNAME]]]]" और पासवर्ड "[[[PASSWORD]]]" के साथ एक्सेस कर सकते हैं।। +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ सादर, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_ja.html b/emails/translations/account-invite_ja.html index dee9531a..65af4f19 100644 --- a/emails/translations/account-invite_ja.html +++ b/emails/translations/account-invite_ja.html @@ -7,7 +7,7 @@ -

サーバー上にアカウントが作成されました [[[SERVERNAME]]]、あなたは今それを使ってそれにアクセスできます：

+

サーバー上にアカウントが作成されました [[[SERVERNAME]]]、あなたは今それを使ってそれにアクセスできます：

   ユーザー名： [[[ACCOUNTNAME]]]
   パスワード： [[[PASSWORD]]] diff --git a/emails/translations/account-invite_ja.txt b/emails/translations/account-invite_ja.txt index 2c92eab7..c25538de 100644 --- a/emails/translations/account-invite_ja.txt +++ b/emails/translations/account-invite_ja.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - アカウントの招待 -サーバー[[[SERVERNAME]]]（[[[SERVERURL]]] /）にアカウントが作成されました。ユーザー名 "[[[ACCOUNTNAME]]]"とパスワード "[[[PASSWORD] ]] "。 +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ 宜しくお願いします、 ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_ko.html b/emails/translations/account-invite_ko.html index 76b37ab8..e04faafa 100644 --- a/emails/translations/account-invite_ko.html +++ b/emails/translations/account-invite_ko.html @@ -7,7 +7,7 @@ -

당신을 위해 서버에서 한 계정이 생성되었습니다. [[[SERVERNAME]]]이제 당신은 다음으로 접근 가능합니다:

+

당신을 위해 서버에서 한 계정이 생성되었습니다. [[[SERVERNAME]]]이제 당신은 다음으로 접근 가능합니다:

   사용자 이름: [[[ACCOUNTNAME]]]
   암호: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_ko.txt b/emails/translations/account-invite_ko.txt index 60ed8079..b6fa8246 100644 --- a/emails/translations/account-invite_ko.txt +++ b/emails/translations/account-invite_ko.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - 계정 초대 -당신을 위해 서버에서 한 계정이 생성되었습니다 : [[[SERVERNAME]]] ([[[SERVERURL]]]/), 이제 당신은 다음 이름으로 접근 가능합니다 : "[[[ACCOUNTNAME]]]" 그리고 비밀번호는 다음과 같습니다 : "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ 최고의 안부를 전합니다, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_nl.html b/emails/translations/account-invite_nl.html index 37310ef7..814f1532 100644 --- a/emails/translations/account-invite_nl.html +++ b/emails/translations/account-invite_nl.html @@ -7,7 +7,7 @@ -

Er is een account voor je aangemaakt op de server [[[SERVERNAME]]], je hebt er nu toegang toe met:

+

Er is een account voor je aangemaakt op de server [[[SERVERNAME]]], je hebt er nu toegang toe met:

   Gebruikersnaam: [[[ACCOUNTNAME]]]
   Wachtwoord: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_nl.txt b/emails/translations/account-invite_nl.txt index 7693c137..2bdff527 100644 --- a/emails/translations/account-invite_nl.txt +++ b/emails/translations/account-invite_nl.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Account uitnodiging -Er is een account jouw aangemaakt op de server [[[SERVERNAME]]] ([[[SERVERURL]]]/), Je kan inloggen met de gebruikersnaam "[[[ACCOUNTNAME]]]" en wachtwoord "[[[PASSWORD]]]". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Vriendelijke groeten, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_pt.html b/emails/translations/account-invite_pt.html index fb865d22..d5da8a08 100644 --- a/emails/translations/account-invite_pt.html +++ b/emails/translations/account-invite_pt.html @@ -7,7 +7,7 @@ -

Uma conta foi criada para você no servidor [[[SERVERNAME]]], você pode acessá-lo agora com:

+

Uma conta foi criada para você no servidor [[[SERVERNAME]]], você pode acessá-lo agora com:

   Nome de usuário: [[[ACCOUNTNAME]]]
   Senha: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_pt.txt b/emails/translations/account-invite_pt.txt index 13e4dba7..d9119918 100644 --- a/emails/translations/account-invite_pt.txt +++ b/emails/translations/account-invite_pt.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Convite para conta -Uma conta foi criada para você no servidor [[[SERVERNAME]]] ([[[SERVERURL]]] /), você pode acessá-la agora com o nome de usuário "[[[ACCOUNTNAME]]]" e a senha "[[[PASSWORD] ]] ". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Cumprimentos, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_ru.html b/emails/translations/account-invite_ru.html index a80d351d..cea04649 100644 --- a/emails/translations/account-invite_ru.html +++ b/emails/translations/account-invite_ru.html @@ -7,7 +7,7 @@ -

Учетная запись была создана для вас на сервере [[[SERVERNAME]]]Вы можете получить к нему доступ сейчас:

+

Учетная запись была создана для вас на сервере [[[SERVERNAME]]]Вы можете получить к нему доступ сейчас:

   Имя пользователя: [[[ACCOUNTNAME]]]
   Пароль: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_ru.txt b/emails/translations/account-invite_ru.txt index dd61c25a..14b47dab 100644 --- a/emails/translations/account-invite_ru.txt +++ b/emails/translations/account-invite_ru.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - приглашение в аккаунт -Учетная запись была создана для вас на сервере [[[SERVERNAME]]] ([[[SERVERURL]]] /), теперь вы можете получить к ней доступ с именем пользователя «[[[ACCOUNTNAME]]]» и паролем «[[[PASSWORD] ]] ". +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ С уважением, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_tr.html b/emails/translations/account-invite_tr.html index 4b56a2eb..7ba1915f 100644 --- a/emails/translations/account-invite_tr.html +++ b/emails/translations/account-invite_tr.html @@ -7,7 +7,7 @@ -

Sunucuda sizin için bir hesap oluşturuldu [[[SERVERNAME]]], şimdi şununla erişebilirsiniz:

+

Sunucuda sizin için bir hesap oluşturuldu [[[SERVERNAME]]], şimdi şununla erişebilirsiniz:

   Kullanıcı adı: [[[ACCOUNTNAME]]]
   Parola: [[[PASSWORD]]] diff --git a/emails/translations/account-invite_tr.txt b/emails/translations/account-invite_tr.txt index fcc2c1e9..aaff8dea 100644 --- a/emails/translations/account-invite_tr.txt +++ b/emails/translations/account-invite_tr.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]] - Hesap Davetiyesi -[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusunda sizin için bir hesap oluşturuldu, şimdi "[[[ACCOUNTNAME]]]" kullanıcı adı ve "[[[PASSWORD]]]" ile bu hesaba erişebilirsiniz. +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ Saygılarımla, ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_zh-chs.html b/emails/translations/account-invite_zh-chs.html index 15c9702d..935828db 100644 --- a/emails/translations/account-invite_zh-chs.html +++ b/emails/translations/account-invite_zh-chs.html @@ -7,7 +7,7 @@ -

在服务器上为您创建了一个帐户 [[[SERVERNAME]]]，您现在可以通过以下方式访问它：

+

在服务器上为您创建了一个帐户 [[[SERVERNAME]]]，您现在可以通过以下方式访问它：

   用户名： [[[ACCOUNTNAME]]]
   密码： [[[PASSWORD]]] diff --git a/emails/translations/account-invite_zh-chs.txt b/emails/translations/account-invite_zh-chs.txt index 1c062380..f761c3f1 100644 --- a/emails/translations/account-invite_zh-chs.txt +++ b/emails/translations/account-invite_zh-chs.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]]-帐户邀请 -已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]]”和密码“ [[[PASSWORD] ]]”。 +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ 最好的祝福， ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-invite_zh-cht.html b/emails/translations/account-invite_zh-cht.html index 3c53381b..9bbd3294 100644 --- a/emails/translations/account-invite_zh-cht.html +++ b/emails/translations/account-invite_zh-cht.html @@ -7,7 +7,7 @@ -

在伺服器上為你創建了一個帳戶 [[[SERVERNAME]]]，你現在可以通過以下方式訪問它：

+

在伺服器上為你創建了一個帳戶 [[[SERVERNAME]]]，你現在可以通過以下方式訪問它：

   用戶名： [[[ACCOUNTNAME]]]
   密碼： [[[PASSWORD]]] diff --git a/emails/translations/account-invite_zh-cht.txt b/emails/translations/account-invite_zh-cht.txt index e41d157f..a98310c4 100644 --- a/emails/translations/account-invite_zh-cht.txt +++ b/emails/translations/account-invite_zh-cht.txt @@ -1,5 +1,5 @@ [[[SERVERNAME]]]-帳戶邀請 -在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。 +An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username "[[[ACCOUNTNAME]]]" and password "[[[PASSWORD]]]". ~ 最好的祝福， ~[[[USERNAME]]] \ No newline at end of file diff --git a/emails/translations/account-reset_cs.html b/emails/translations/account-reset_cs.html index 43caea34..f5b5cae1 100644 --- a/emails/translations/account-reset_cs.html +++ b/emails/translations/account-reset_cs.html @@ -7,9 +7,9 @@ -

Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje obnovení hesla k účtu, dokončete proces kliknutím na následující odkaz.

+

Ahoj [[[USERNAME]]], [[[SERVERNAME]]] požaduje obnovení hesla k účtu, dokončete proces kliknutím na následující odkaz.

- Kliknutím sem obnovíte heslo svého účtu. + Kliknutím sem obnovíte heslo svého účtu.

Pokud jste tento požadavek nezačali, ignorujte tento e-mail. \ No newline at end of file diff --git a/emails/translations/account-reset_cs.txt b/emails/translations/account-reset_cs.txt index e56beed7..3d8baad7 100644 --- a/emails/translations/account-reset_cs.txt +++ b/emails/translations/account-reset_cs.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Reset účtu -Ahoj [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]])) požaduje obnovení hesla k účtu. Chcete-li proces dokončit, přejděte na následující odkaz: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Pokud jste tento požadavek nezačali, ignorujte tento e-mail. \ No newline at end of file diff --git a/emails/translations/account-reset_de.html b/emails/translations/account-reset_de.html index e9085ab4..63caa2e8 100644 --- a/emails/translations/account-reset_de.html +++ b/emails/translations/account-reset_de.html @@ -7,9 +7,9 @@ -

Hallo [[[USERNAME]]], [[[SERVERNAME]]] Wenn Sie ein Zurücksetzen des Kontokennworts anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.

+

Hallo [[[USERNAME]]], [[[SERVERNAME]]] Wenn Sie ein Zurücksetzen des Kontokennworts anfordern, klicken Sie auf den folgenden Link, um den Vorgang abzuschließen.

- Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen. + Klicken Sie hier, um Ihr Kontopasswort zurückzusetzen.

Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte. \ No newline at end of file diff --git a/emails/translations/account-reset_de.txt b/emails/translations/account-reset_de.txt index b735b10f..77d08850 100644 --- a/emails/translations/account-reset_de.txt +++ b/emails/translations/account-reset_de.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Zurücksetzen des Kontos -Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) fordert ein Zurücksetzen des Kontokennworts an. Klicken Sie auf den folgenden Link, um den Vorgang abzuschließen: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte. \ No newline at end of file diff --git a/emails/translations/account-reset_es.html b/emails/translations/account-reset_es.html index 77561429..63eed118 100644 --- a/emails/translations/account-reset_es.html +++ b/emails/translations/account-reset_es.html @@ -7,9 +7,9 @@ -

Hola [[[USERNAME]]], [[[SERVERNAME]]] solicita restablecer la contraseña de la cuenta, haga clic en el siguiente enlace para completar el proceso.

+

Hola [[[USERNAME]]], [[[SERVERNAME]]] solicita restablecer la contraseña de la cuenta, haga clic en el siguiente enlace para completar el proceso.

- Haga clic aquí para restablecer la contraseña de su cuenta. + Haga clic aquí para restablecer la contraseña de su cuenta.

Si Ud. no inicio este requerimiento, por favor ignore este correo. \ No newline at end of file diff --git a/emails/translations/account-reset_es.txt b/emails/translations/account-reset_es.txt index 3b0fc193..e340566e 100644 --- a/emails/translations/account-reset_es.txt +++ b/emails/translations/account-reset_es.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Restablecimiento de Cuenta -Hola [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando un restablecimiento de contraseña de cuenta. Navegue al siguiente enlace para completar el proceso: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Si Ud. no inicio este requerimiento, por favor ignore este correo. \ No newline at end of file diff --git a/emails/translations/account-reset_fi.html b/emails/translations/account-reset_fi.html index 97f61ec7..99bb08f2 100644 --- a/emails/translations/account-reset_fi.html +++ b/emails/translations/account-reset_fi.html @@ -7,9 +7,9 @@ -

Moi [[[USERNAME]]], [[[SERVERNAME]]] pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.

+

Moi [[[USERNAME]]], [[[SERVERNAME]]] pyytää tilin salasanan palauttamista, suorita prosessi napsauttamalla seuraavaa linkkiä.

- Palauta tilisi salasana napsauttamalla tätä. + Palauta tilisi salasana napsauttamalla tätä.

Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin. \ No newline at end of file diff --git a/emails/translations/account-reset_fi.txt b/emails/translations/account-reset_fi.txt index 849f61be..29e9c184 100644 --- a/emails/translations/account-reset_fi.txt +++ b/emails/translations/account-reset_fi.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Tili nollattu -Hei [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) pyytää tilin salasanan palauttamista. Seuraa linkkiä prosessin loppuun saattamiseksi: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin. \ No newline at end of file diff --git a/emails/translations/account-reset_fr.html b/emails/translations/account-reset_fr.html index c8c30208..8cab5d35 100644 --- a/emails/translations/account-reset_fr.html +++ b/emails/translations/account-reset_fr.html @@ -7,9 +7,9 @@ -

Bonjour [[[USERNAME]]], [[[SERVERNAME]]] demande une réinitialisation du mot de passe du compte, cliquez sur le lien suivant pour terminer le processus.

+

Bonjour [[[USERNAME]]], [[[SERVERNAME]]] demande une réinitialisation du mot de passe du compte, cliquez sur le lien suivant pour terminer le processus.

- Cliquez ici pour réinitialiser le mot de passe de votre compte. + Cliquez ici pour réinitialiser le mot de passe de votre compte.

Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier. \ No newline at end of file diff --git a/emails/translations/account-reset_fr.txt b/emails/translations/account-reset_fr.txt index 2beddc69..2577d2d3 100644 --- a/emails/translations/account-reset_fr.txt +++ b/emails/translations/account-reset_fr.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Réinitialisation du compte -Bonjour [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) demande une réinitialisation du mot de passe du compte. Accédez au lien suivant pour terminer le processus: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier. \ No newline at end of file diff --git a/emails/translations/account-reset_hi.html b/emails/translations/account-reset_hi.html index 1c2fb01c..85808d60 100644 --- a/emails/translations/account-reset_hi.html +++ b/emails/translations/account-reset_hi.html @@ -7,9 +7,9 @@ -

हाय [[[USERNAME]]], [[[SERVERNAME]]] खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।

+

हाय [[[USERNAME]]], [[[SERVERNAME]]] खाता पासवर्ड रीसेट का अनुरोध कर रहा है, प्रक्रिया पूरी करने के लिए निम्न लिंक पर क्लिक करें।

- अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें। + अपना खाता पासवर्ड रीसेट करने के लिए यहां क्लिक करें।

यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें। \ No newline at end of file diff --git a/emails/translations/account-reset_hi.txt b/emails/translations/account-reset_hi.txt index 0dd9f94f..a1b76a61 100644 --- a/emails/translations/account-reset_hi.txt +++ b/emails/translations/account-reset_hi.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - खाता रीसेट -हाय [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]] से खाता पासवर्ड रीसेट करने का अनुरोध किया जा रहा है। प्रक्रिया को पूरा करने के लिए निम्नलिखित लिंक को बताएं: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें। \ No newline at end of file diff --git a/emails/translations/account-reset_ja.html b/emails/translations/account-reset_ja.html index 28322fe4..bd2ec174 100644 --- a/emails/translations/account-reset_ja.html +++ b/emails/translations/account-reset_ja.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]]様 [[[SERVERNAME]]] がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。

+

[[[USERNAME]]]様 [[[SERVERNAME]]] がアカウントパスワードのリセットを要求している場合は、次のリンクをクリックしてプロセスを完了します。

- ここをクリックしてアカウントのパスワードをリセットしてください。 + ここをクリックしてアカウントのパスワードをリセットしてください。

このリクエストを開始していない場合は、このメールを無視してください。 \ No newline at end of file diff --git a/emails/translations/account-reset_ja.txt b/emails/translations/account-reset_ja.txt index 3e946e53..910bea9f 100644 --- a/emails/translations/account-reset_ja.txt +++ b/emails/translations/account-reset_ja.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - アカウントのリセット -こんにちは[[[USERNAME]]]、[[[SERVERNAME]]]（[[[SERVERURL]]]）はアカウントパスワードのリセットをリクエストしています。プロセスを完了するには、次のリンクに移動します。 +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ このリクエストを開始していない場合は、このメールを無視してください。 \ No newline at end of file diff --git a/emails/translations/account-reset_ko.html b/emails/translations/account-reset_ko.html index e4caa860..db32681d 100644 --- a/emails/translations/account-reset_ko.html +++ b/emails/translations/account-reset_ko.html @@ -7,9 +7,9 @@ -

안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.

+

안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] 계정 비밀번호 재설정을 요청하는 경우, 다음 링크를 클릭하여 과정을 완료하십시오.

- 당신의 계정 암호를 초기화하려면 여기를 클릭하십시오. + 당신의 계정 암호를 초기화하려면 여기를 클릭하십시오.

이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오. \ No newline at end of file diff --git a/emails/translations/account-reset_ko.txt b/emails/translations/account-reset_ko.txt index be4aef0c..cb9d7b54 100644 --- a/emails/translations/account-reset_ko.txt +++ b/emails/translations/account-reset_ko.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - 계정 재설정 -안녕하세요, [[[USERNAME]]]님. [[[SERVERNAME]]] ([[[SERVERURL]]])은 계정 비밀번호 초기화를 위해 요구됩니다. 다음 링크로 이동하여 과정을 완료하십시오 : +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오. \ No newline at end of file diff --git a/emails/translations/account-reset_nl.html b/emails/translations/account-reset_nl.html index 8faf6eab..cb4a4979 100644 --- a/emails/translations/account-reset_nl.html +++ b/emails/translations/account-reset_nl.html @@ -7,9 +7,9 @@ -

Hallo [[[USERNAME]]], [[[SERVERNAME]]] vraagt om het opnieuw instellen van het wachtwoord van een account, klik op de volgende link om het proces te voltooien.

+

Hallo [[[USERNAME]]], [[[SERVERNAME]]] vraagt om het opnieuw instellen van het wachtwoord van een account, klik op de volgende link om het proces te voltooien.

- Klik hier om je wachtwoord opnieuw in te stellen. + Klik hier om je wachtwoord opnieuw in te stellen.

Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren. \ No newline at end of file diff --git a/emails/translations/account-reset_nl.txt b/emails/translations/account-reset_nl.txt index 0385cd29..7cb4666b 100644 --- a/emails/translations/account-reset_nl.txt +++ b/emails/translations/account-reset_nl.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Account Reset -Hallo [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) vraagt om het opnieuw instellen van het account wachtwoord. Ga naar de volgende link om het proces te voltooien: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren. \ No newline at end of file diff --git a/emails/translations/account-reset_pt.html b/emails/translations/account-reset_pt.html index 653dd713..c790c845 100644 --- a/emails/translations/account-reset_pt.html +++ b/emails/translations/account-reset_pt.html @@ -7,9 +7,9 @@ -

Olá [[[NOME DE USUÁRIO]]], [[[SERVERNAME]]] está solicitando a redefinição da senha da conta, clique no link a seguir para concluir o processo.

+

Olá [[[NOME DE USUÁRIO]]], [[[SERVERNAME]]] está solicitando a redefinição da senha da conta, clique no link a seguir para concluir o processo.

- Clique aqui para redefinir a senha da sua conta. + Clique aqui para redefinir a senha da sua conta.

Se você não iniciou esta solicitação, ignore este e-mail. \ No newline at end of file diff --git a/emails/translations/account-reset_pt.txt b/emails/translations/account-reset_pt.txt index c7ea7156..a3deed16 100644 --- a/emails/translations/account-reset_pt.txt +++ b/emails/translations/account-reset_pt.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Redefinição de conta -Olá, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) está solicitando uma redefinição de senha de conta. Acesse o seguinte link para concluir o processo: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Se você não iniciou esta solicitação, ignore este e-mail. \ No newline at end of file diff --git a/emails/translations/account-reset_ru.html b/emails/translations/account-reset_ru.html index da951955..e6cba832 100644 --- a/emails/translations/account-reset_ru.html +++ b/emails/translations/account-reset_ru.html @@ -7,9 +7,9 @@ -

Привет [[[USERNAME]]], [[[SERVERNAME]]] запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.

+

Привет [[[USERNAME]]], [[[SERVERNAME]]] запрашивает сброс пароля учетной записи, нажмите на следующую ссылку, чтобы завершить процесс.

- Нажмите здесь, чтобы сбросить пароль учетной записи. + Нажмите здесь, чтобы сбросить пароль учетной записи.

Если вы не инициировали этот запрос, игнорируйте это письмо. \ No newline at end of file diff --git a/emails/translations/account-reset_ru.txt b/emails/translations/account-reset_ru.txt index f851d3d9..8a090937 100644 --- a/emails/translations/account-reset_ru.txt +++ b/emails/translations/account-reset_ru.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Сброс учетной записи -Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) запрашивает сброс пароля учетной записи. Для завершения процесса перейдите по следующей ссылке: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Если вы не инициировали этот запрос, игнорируйте это письмо. \ No newline at end of file diff --git a/emails/translations/account-reset_tr.html b/emails/translations/account-reset_tr.html index afd41af5..9faf6e79 100644 --- a/emails/translations/account-reset_tr.html +++ b/emails/translations/account-reset_tr.html @@ -7,9 +7,9 @@ -

Merhaba [[[USERNAME]]], [[[SERVERNAME]]] bir hesap şifresi sıfırlama talep ediyor, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.

+

Merhaba [[[USERNAME]]], [[[SERVERNAME]]] bir hesap şifresi sıfırlama talep ediyor, işlemi tamamlamak için aşağıdaki bağlantıya tıklayın.

- Hesap şifrenizi sıfırlamak için burayı tıklayın. + Hesap şifrenizi sıfırlamak için burayı tıklayın.

Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın. \ No newline at end of file diff --git a/emails/translations/account-reset_tr.txt b/emails/translations/account-reset_tr.txt index ee909ad7..57bc24d3 100644 --- a/emails/translations/account-reset_tr.txt +++ b/emails/translations/account-reset_tr.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]] - Hesabı Sıfırlama -Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir hesap şifresi sıfırlama istiyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin: +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın. \ No newline at end of file diff --git a/emails/translations/account-reset_zh-chs.html b/emails/translations/account-reset_zh-chs.html index 0507ef5f..eb2e88eb 100644 --- a/emails/translations/account-reset_zh-chs.html +++ b/emails/translations/account-reset_zh-chs.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]，你好， [[[SERVERNAME]]] 正在要求重置帐户密码，请单击以下连结以完成该过程。

+

[[[USERNAME]]，你好， [[[SERVERNAME]]] 正在要求重置帐户密码，请单击以下连结以完成该过程。

- 单击此处重置您的帐户密码。 + 单击此处重置您的帐户密码。

如果您没有发起此请求，请不理此邮件。 \ No newline at end of file diff --git a/emails/translations/account-reset_zh-chs.txt b/emails/translations/account-reset_zh-chs.txt index cca304f7..a428475f 100644 --- a/emails/translations/account-reset_zh-chs.txt +++ b/emails/translations/account-reset_zh-chs.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]]-帐户重置 -[[[USERNAME]]，您好：[[[SERVERNAME]]]（[[[SERVERURL]]]）正在请求重置帐户密码。导航至以下连结以完成该过程： +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 如果您没有发起此请求，请不理此邮件。 \ No newline at end of file diff --git a/emails/translations/account-reset_zh-cht.html b/emails/translations/account-reset_zh-cht.html index e1232233..7e4aa9fa 100644 --- a/emails/translations/account-reset_zh-cht.html +++ b/emails/translations/account-reset_zh-cht.html @@ -7,9 +7,9 @@ -

[[[USERNAME]]，你好， [[[SERVERNAME]] 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。

+

[[[USERNAME]]，你好， [[[SERVERNAME]] 正在要求重置帳戶密碼，請單擊以下鏈結以完成該過程。

- 單擊此處重置你的帳戶密碼。 + 單擊此處重置你的帳戶密碼。

如果你沒有發起此請求，請不理此電郵。 \ No newline at end of file diff --git a/emails/translations/account-reset_zh-cht.txt b/emails/translations/account-reset_zh-cht.txt index 85b4cad2..01dbafb1 100644 --- a/emails/translations/account-reset_zh-cht.txt +++ b/emails/translations/account-reset_zh-cht.txt @@ -1,6 +1,6 @@ [[[SERVERNAME]]]-帳戶重置 -[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程： +Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process: ~ -~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]] +~[[[SERVERURL]]]/checkmail?c=[[[COOKIE]]][[[URLARGS2]]] ~ 如果你沒有發起此請求，請不理此電郵。 \ No newline at end of file diff --git a/emails/translations/mesh-invite_cs.txt b/emails/translations/mesh-invite_cs.txt index fb9b3057..cd87c864 100644 --- a/emails/translations/mesh-invite_cs.txt +++ b/emails/translations/mesh-invite_cs.txt @@ -2,7 +2,7 @@ ~ Dobrý den, [[[NAME]]], ~ -Uživatel [[[USERNAME]]] na serveru [[[SERVERNAME]]] ([[[SERVERURL]]]/) požaduje instalaci softwaru k zahájení relace vzdáleného řízení. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Zpráva: [[[MSG]]] @@ -27,7 +27,7 @@ V případě systému Linux vyjměte a vložte do terminálu a nainstalujte agen ~ ~ ~ -Chcete-li nainstalovat software, přejděte na [[[SERVERURL]]][[[LINKURL]]] a postupujte podle pokynů. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Pokud jste tento požadavek nezačali, ignorujte tento e-mail. ~ diff --git a/emails/translations/mesh-invite_de.txt b/emails/translations/mesh-invite_de.txt index c13d9e12..af4a27ed 100644 --- a/emails/translations/mesh-invite_de.txt +++ b/emails/translations/mesh-invite_de.txt @@ -2,7 +2,7 @@ ~ Hallo [[[NAME]]], ~ -Benutzer [[[USERNAME]]] auf dem Server [[[SERVERNAME]]] ([[[SERVERURL]]]/) fordert Sie auf, Software zu installieren, um die Fernsteuerungssitzung zu starten. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Nachricht: [[[MSG]]] @@ -27,7 +27,7 @@ Schneiden Sie unter Linux Folgendes aus und fügen Sie es in ein Terminal ein, u ~ ~ ~ -Navigieren Sie zum Installieren der Software zu [[[SERVERURL]]][[[LINKURL]]] und befolgen Sie die Anweisungen. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Wenn Sie diese Anfrage nicht initiiert haben, ignorieren Sie diese Mail bitte. ~ diff --git a/emails/translations/mesh-invite_es.txt b/emails/translations/mesh-invite_es.txt index 04b6446e..e368e121 100644 --- a/emails/translations/mesh-invite_es.txt +++ b/emails/translations/mesh-invite_es.txt @@ -2,7 +2,7 @@ ~ Hola [[[NAME]]], ~ -Usuario [[[USERNAME]]] en servitor [[[SERVERNAME]]] ([[[SERVERURL]]]/) solicita que instale el software para iniciar la sesión de control remoto. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Mensaje: [[[MSG]]] @@ -27,7 +27,7 @@ Para Linux, copie y pegue lo siguiente en la terminal para instalar el agente: ~ ~ ~ -Para instalar el software, navega a [[[SERVERURL]]][[[LINKURL]]] y siga las instrucciones. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Si Ud. no inicio este requerimiento, por favor ignore este correo. ~ diff --git a/emails/translations/mesh-invite_fi.txt b/emails/translations/mesh-invite_fi.txt index 65746777..756c9cf7 100644 --- a/emails/translations/mesh-invite_fi.txt +++ b/emails/translations/mesh-invite_fi.txt @@ -2,7 +2,7 @@ ~ Hei [[[NAME]]], ~ -Käyttäjä[[[USERNAME]]] palvelimella [[[SERVERNAME]]] ([[[SERVERURL]]]/) pyytää sinua asentamaan ohjelmiston etähallintaistunnon käynnistämiseksi. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Viesti: [[[MSG]]] @@ -27,7 +27,7 @@ Linux: leikkaa ja liitä seuraava päätelaitteeseen agentin asentamiseksi: ~ ~ ~ -Asenna ohjelmisto siirtymällä kohtaan [[[SERVERURL]]] [[[[LINKURL]]] ja noudattamalla ohjeita. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Jos et suorittanut tätä pyyntöä, voit ohitaa tämän sähköpostin. ~ diff --git a/emails/translations/mesh-invite_fr.txt b/emails/translations/mesh-invite_fr.txt index b3fe9c51..3a6243ab 100644 --- a/emails/translations/mesh-invite_fr.txt +++ b/emails/translations/mesh-invite_fr.txt @@ -2,7 +2,7 @@ ~ Bonjour [[[NAME]]], ~ -L'utilisateur [[[USERNAME]]] sur le serveur [[[SERVERNAME]]] ([[[SERVERURL]]]/) vous demande d'installer un logiciel pour démarrer la session de contrôle à distance. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Message: [[[MSG]]] @@ -27,7 +27,7 @@ Pour Linux, copiez et collez les éléments suivants dans un terminal pour insta ~ ~ ~ -Pour installer le logiciel, accédez à [[[SERVERURL]]][[[LINKURL]]] et suivez les instructions. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Si vous n'avez pas initié cette demande, veuillez ignorer ce courrier. ~ diff --git a/emails/translations/mesh-invite_hi.txt b/emails/translations/mesh-invite_hi.txt index 52e2edd6..7a4756a8 100644 --- a/emails/translations/mesh-invite_hi.txt +++ b/emails/translations/mesh-invite_hi.txt @@ -2,7 +2,7 @@ ~ नमस्कार [[[NAME]]], ~ -उपयोगकर्ता [[[USERNAME]]] सर्वर पर [[[SERVERNAME]]] ([[[SERVERURL]]]/) आपसे रिमोट कंट्रोल सेशन शुरू करने के लिए सॉफ़्टवेयर स्थापित करने का अनुरोध कर रहा है। +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ संदेश: [[[MSG]]] @@ -27,7 +27,7 @@ Apple OSX के लिए, इस प्रक्रिया को पूर ~ ~ ~ -सॉफ़्टवेयर को स्थापित करने के लिए, [[[SERVERURL]]] [[[LINKURL]]] पर जाएँ और निर्देशों का पालन करें। +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ यदि आपने यह अनुरोध आरंभ नहीं किया है, तो कृपया इस मेल को अनदेखा करें। ~ diff --git a/emails/translations/mesh-invite_ja.txt b/emails/translations/mesh-invite_ja.txt index 060c6397..03b1819d 100644 --- a/emails/translations/mesh-invite_ja.txt +++ b/emails/translations/mesh-invite_ja.txt @@ -2,7 +2,7 @@ ~ [[[NAME]]]様 ~ -サーバー[[[SERVERNAME]]]（[[[SERVERURL]]]/）のユーザー[[[USERNAME]]]が、リモートコントロールセッションを開始するためのソフトウェアのインストールを要求しています。 +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ メッセージ：[[[MSG]]] @@ -27,7 +27,7 @@ Linuxの場合は、ターミナルで以下をカットアンドペーストし ~ ~ ~ -ソフトウェアをインストールするには、[[[SERVERURL]]][[[LINKURL]]]に移動し、指示に従います。 +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ このリクエストを開始していない場合は、このメールを無視してください。 ~ diff --git a/emails/translations/mesh-invite_ko.txt b/emails/translations/mesh-invite_ko.txt index faef4d6f..df7b8d0f 100644 --- a/emails/translations/mesh-invite_ko.txt +++ b/emails/translations/mesh-invite_ko.txt @@ -2,7 +2,7 @@ ~ 안녕하세요, [[[NAME]]]님. ~ -[[[SERVERNAME]]] ([[[SERVERURL]]]/) 서버의 [[[USERNAME]]] 사용자가 원격 제어 세션을 시작하기 위해서는 소프트웨어 설치가 요구됩니다. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ 메시지: [[[MSG]]] @@ -28,7 +28,7 @@ Linux의 경우, 다음을 잘라내어 터미널에 붙여 넣어 에이전트 ~ ~ ~ -소프트웨어를 설치하려면, 다음에 접속하여 지시에 따르십시오 : [[[SERVERURL]]][[[LINKURL]]] +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ 이 요청을 시작하지 않은 경우, 이 메일을 무시하십시오. ~ diff --git a/emails/translations/mesh-invite_nl.txt b/emails/translations/mesh-invite_nl.txt index 38f8b74d..6142c22a 100644 --- a/emails/translations/mesh-invite_nl.txt +++ b/emails/translations/mesh-invite_nl.txt @@ -2,7 +2,7 @@ ~ Hallo [[[NAME]]], ~ -Gebruiker [[[USERNAME]]] op server [[[SERVERNAME]]] ([[[SERVERURL]]]/) vraagt u de software te installeren om de sessie voor afstandsbediening te starten. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Bericht: [[[MSG]]] @@ -27,7 +27,7 @@ Voor Linux, knip het volgende en plak dit in een terminal om de agent te install ~ ~ ~ -Om de software te installeren, navigeert u naar [[[SERVERURL]]][[[LINKURL]]] en volgt u de instructies. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Als u dit verzoek niet heeft ingediend, dan kunt u deze e-mail negeren. ~ diff --git a/emails/translations/mesh-invite_pt.txt b/emails/translations/mesh-invite_pt.txt index 1003c185..c2a30572 100644 --- a/emails/translations/mesh-invite_pt.txt +++ b/emails/translations/mesh-invite_pt.txt @@ -2,7 +2,7 @@ ~ Olá [[[NAME]]], ~ -O usuário [[[USERNAME]]] no servidor [[[SERVERNAME]]] ([[[SERVERURL]]] /) está solicitando a instalação do software para iniciar a sessão de controle remoto. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Mensagem: [[[MSG]]] @@ -27,7 +27,7 @@ Para Linux, recorte e cole o seguinte em um terminal para instalar o agente: ~ ~ ~ -Para instalar o software, navegue até [[[SERVERURL]]] [[[LINKURL]]] e siga as instruções. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Se você não iniciou esta solicitação, ignore este e-mail. ~ diff --git a/emails/translations/mesh-invite_ru.txt b/emails/translations/mesh-invite_ru.txt index 79eaf433..6477b8ac 100644 --- a/emails/translations/mesh-invite_ru.txt +++ b/emails/translations/mesh-invite_ru.txt @@ -2,7 +2,7 @@ ~ Здравствуйте, [[[NAME]]], ~ -Пользователь [[[USERNAME]]] на сервере [[[SERVERNAME]]] ([[[SERVERURL]]]/) запрашивает установку программного обеспечения для запуска сеанса удаленного управления. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Сообщение: [[[MSG]]] @@ -27,7 +27,7 @@ ~ ~ ~ -Для установки программного обеспечения перейдите к [[[SERVERURL]]][[[LINKURL]]] и следуйте инструкциям. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Если вы не инициировали этот запрос, игнорируйте это письмо. ~ diff --git a/emails/translations/mesh-invite_tr.txt b/emails/translations/mesh-invite_tr.txt index 87faa263..c6809c29 100644 --- a/emails/translations/mesh-invite_tr.txt +++ b/emails/translations/mesh-invite_tr.txt @@ -2,7 +2,7 @@ ~ Merhaba [[[NAME]]], ~ -[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusundaki [[[USERNAME]]] uzaktan kontrol oturumunu başlatmak için yazılım yüklemenizi istiyor. +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ Mesaj: [[[MSG]]] @@ -27,7 +27,7 @@ Linux için, aracıyı yüklemek için aşağıdakileri kesip bir terminale yap ~ ~ ~ -Yazılımı kurmak için [[[SERVERURL]]][[[LINKURL]]] adresine gidin ve talimatları takip edin. +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ Bu isteği siz başlatmadıysanız, lütfen bu postayı dikkate almayın. ~ diff --git a/emails/translations/mesh-invite_zh-chs.txt b/emails/translations/mesh-invite_zh-chs.txt index 39a98575..9913fc6d 100644 --- a/emails/translations/mesh-invite_zh-chs.txt +++ b/emails/translations/mesh-invite_zh-chs.txt @@ -2,7 +2,7 @@ ~ 您好[[[NAME]]]， ~ -服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/）上的用户[[[USERNAME]]]请求您安装软件以启动远程控制。 +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ 消息：[[[MSG]]] @@ -27,7 +27,7 @@ ~ ~ ~ -要安装软件，请导航至[[[SERVERURL]]][[[LINKURL]]]，然后按照说明进行操作。 +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ 如果您没有发起此请求，请不理此邮件。 ~ diff --git a/emails/translations/mesh-invite_zh-cht.txt b/emails/translations/mesh-invite_zh-cht.txt index d85dbbd3..8b657367 100644 --- a/emails/translations/mesh-invite_zh-cht.txt +++ b/emails/translations/mesh-invite_zh-cht.txt @@ -2,7 +2,7 @@ ~ 你好[[[NAME]]]， ~ -伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。 +User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session. ~ ~ 訊息：[[[MSG]]] @@ -27,7 +27,7 @@ ~ ~ ~ -要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。 +To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions. ~ 如果你沒有發起此請求，請不理此電郵。 ~ diff --git a/meshmail.js b/meshmail.js index 36b9eac3..9df1578c 100644 --- a/meshmail.js +++ b/meshmail.js @@ -148,7 +148,7 @@ module.exports.CreateMeshMail = function (parent) { }; // Send account login mail / 2 factor token - obj.sendAccountLoginMail = function (domain, email, token, language) { + obj.sendAccountLoginMail = function (domain, email, token, language, loginkey) { obj.checkEmail(email, function (checked) { if (checked) { parent.debug('email', "Sending login token to " + email); @@ -166,6 +166,7 @@ module.exports.CreateMeshMail = function (parent) { // Set all the options. var options = { email: email, servername: domain.title ? domain.title : 'MeshCentral', token: token }; + if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; } // Send the email 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) { }; // Send account invitation mail - obj.sendAccountInviteMail = function (domain, username, accountname, email, password, language) { + obj.sendAccountInviteMail = function (domain, username, accountname, email, password, language, loginkey) { obj.checkEmail(email, function (checked) { if (checked) { parent.debug('email', "Sending account invitation to " + email); @@ -193,6 +194,7 @@ module.exports.CreateMeshMail = function (parent) { // Set all the options. var options = { username: username, accountname: accountname, email: email, servername: domain.title ? domain.title : 'MeshCentral', password: password }; + if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; } // Send the email 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) { }; // Send account check mail - obj.sendAccountCheckMail = function (domain, username, email, language) { + obj.sendAccountCheckMail = function (domain, username, email, language, loginkey) { obj.checkEmail(email, function (checked) { if (checked) { parent.debug('email', "Sending email verification to " + email); @@ -220,6 +222,7 @@ module.exports.CreateMeshMail = function (parent) { // Set all the options. var options = { username: username, email: email, servername: domain.title ? domain.title : 'MeshCentral' }; + if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; } options.cookie = obj.parent.encodeCookie({ u: domain.id + '/' + username.toLowerCase(), e: email, a: 1 }, obj.mailCookieEncryptionKey); // Send the email @@ -230,7 +233,7 @@ module.exports.CreateMeshMail = function (parent) { }; // Send account reset mail - obj.sendAccountResetMail = function (domain, username, email, language) { + obj.sendAccountResetMail = function (domain, username, email, language, loginkey) { obj.checkEmail(email, function (checked) { if (checked) { parent.debug('email', "Sending account password reset to " + email); @@ -248,6 +251,7 @@ module.exports.CreateMeshMail = function (parent) { // Set all the options. var options = { username: username, email: email, servername: domain.title ? domain.title : 'MeshCentral' }; + if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; } options.cookie = obj.parent.encodeCookie({ u: domain.id + '/' + username, e: email, a: 2 }, obj.mailCookieEncryptionKey); // Send the email @@ -258,7 +262,7 @@ module.exports.CreateMeshMail = function (parent) { }; // Send agent invite mail - obj.sendAgentInviteMail = function (domain, username, email, meshid, name, os, msg, flags, expirehours, language) { + obj.sendAgentInviteMail = function (domain, username, email, meshid, name, os, msg, flags, expirehours, language, loginkey) { obj.checkEmail(email, function (checked) { if (checked) { parent.debug('email', "Sending agent install invitation to " + email); @@ -276,6 +280,7 @@ module.exports.CreateMeshMail = function (parent) { // Set all the template replacement options and generate the final email text (both in txt and html formats). var options = { username: username, name: name, email: email, installflags: flags, msg: msg, meshid: meshid, meshidhex: meshid.split('/')[2], servername: domain.title ? domain.title : 'MeshCentral' }; + if (loginkey != null) { options.urlargs1 = '?key=' + loginkey; options.urlargs2 = '&key=' + loginkey; } else { options.urlargs1 = ''; options.urlargs2 = ''; } options.windows = ((os == 0) || (os == 1)) ? 1 : 0; options.linux = ((os == 0) || (os == 2)) ? 1 : 0; options.osx = ((os == 0) || (os == 3)) ? 1 : 0; diff --git a/public/scripts/common-0.0.1-min.js b/public/scripts/common-0.0.1-min.js index c8e42840..9b25e8e5 100644 --- a/public/scripts/common-0.0.1-min.js +++ b/public/scripts/common-0.0.1-min.js @@ -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(/").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+="
"+gap(t)+"Item #"+r+": "+ObjectToStringEx(n[r],t+1);else if(n instanceof Object)for(var r in n)e+="
"+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")&&-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 +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(/").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+="
"+gap(t)+"Item #"+e+": "+ObjectToStringEx(n[e],t+1);else if(n instanceof Object)for(var e in n)r+="
"+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")&&-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 diff --git a/public/scripts/common-0.0.1.js b/public/scripts/common-0.0.1.js index 49c3c67d..b9fc0b12 100644 --- a/public/scripts/common-0.0.1.js +++ b/public/scripts/common-0.0.1.js @@ -118,17 +118,13 @@ function isSafeString2(str) { return ((typeof str == 'string') && (str.indexOf(' function parseUriArgs() { var href = window.document.location.href; if (href.endsWith('#')) { href = href.substring(0, href.length - 1); } - var name, r = {}, parsedUri = href.split(/[\?&|\=]/); + var name, r = {}, parsedUri = href.split(/[\?&|]/); parsedUri.splice(0, 1); - for (x in parsedUri) { - switch (x % 2) { - case 0: { name = decodeURIComponent(parsedUri[x]); break; } - case 1: { - r[name] = decodeURIComponent(parsedUri[x]); - if (!isSafeString2(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } } - break; - } default: { break; } - } + for (var j in parsedUri) { + var arg = parsedUri[j], i = arg.indexOf('='); + name = arg.substring(0, i); + r[name] = arg.substring(i + 1); + if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } } } return r; } \ No newline at end of file diff --git a/translate/translate.json b/translate/translate.json index 1352d2af..09a9067e 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -4688,10 +4688,7 @@ "ru": "Учетная запись была создана для вас на сервере [[[SERVERNAME]]] ([[[SERVERURL]]] /), теперь вы можете получить к ней доступ с именем пользователя «[[[ACCOUNTNAME]]]» и паролем «[[[PASSWORD] ]] \".", "tr": "[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusunda sizin için bir hesap oluşturuldu, şimdi \"[[[ACCOUNTNAME]]]\" kullanıcı adı ve \"[[[PASSWORD]]]\" ile bu hesaba erişebilirsiniz.", "zh-chs": "已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]]”和密码“ [[[PASSWORD] ]]”。", - "zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。", - "xloc": [ - "account-invite.txt" - ] + "zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]]”和密碼“ [[[PASSWORD] ]]”。" }, { "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 @@ "zh-chs": "已在服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/ 上为您创建了一个帐户，您现在可以使用用户名“ [[[ACCOUNTNAME]]] 和密码 “[[[PASSWORD]]]”。", "zh-cht": "在伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /上為你創建了一個帳戶，你現在可以使用用戶名“ [[[ACCOUNTNAME]]] ” en wachtwoord “[[[PASSWORD]]]”。" }, + { + "en": "An account was created for you on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]), you can access it now with username \"[[[ACCOUNTNAME]]]\" and password \"[[[PASSWORD]]]\".", + "xloc": [ + "account-invite.txt" + ] + }, { "cs": "Android APK", "de": "Android-APK", @@ -16938,10 +16941,7 @@ "ru": "Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) выполняет проверку электронной почты. Для завершения процесса перейдите по следующей ссылке:", "tr": "Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir e-posta doğrulaması yapıyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:", "zh-chs": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在执行电邮验证。导航至以下连结以完成该过程：", - "zh-cht": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程：", - "xloc": [ - "account-check.txt" - ] + "zh-cht": "嗨[[[USERNAME]]]，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在執行電郵驗證。導航至以下鏈結以完成該過程：" }, { "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 @@ "ru": "Здравствуйте, [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) запрашивает сброс пароля учетной записи. Для завершения процесса перейдите по следующей ссылке:", "tr": "Merhaba [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]]) bir hesap şifresi sıfırlama istiyor. İşlemi tamamlamak için aşağıdaki bağlantıya gidin:", "zh-chs": "[[[USERNAME]]，您好：[[[SERVERNAME]]]（[[[SERVERURL]]]）正在请求重置帐户密码。导航至以下连结以完成该过程：", - "zh-cht": "[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程：", + "zh-cht": "[[[USERNAME]]，你好，[[[SERVERNAME]]]（[[[SERVERURL]]]）正在請求重設帳戶密碼。導航至以下鏈結以完成該過程：" + }, + { + "en": "Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is performing an e-mail verification. Nagivate to the following link to complete the process:", + "xloc": [ + "account-check.txt" + ] + }, + { + "en": "Hi [[[USERNAME]]], [[[SERVERNAME]]] ([[[SERVERURL]]][[[URLARGS1]]]) is requesting an account password reset. Nagivate to the following link to complete the process:", "xloc": [ "account-reset.txt" ] @@ -35817,7 +35826,10 @@ "ru": "Для установки программного обеспечения перейдите к [[[SERVERURL]]][[[LINKURL]]] и следуйте инструкциям.", "tr": "Yazılımı kurmak için [[[SERVERURL]]][[[LINKURL]]] adresine gidin ve talimatları takip edin.", "zh-chs": "要安装软件，请导航至[[[SERVERURL]]][[[LINKURL]]]，然后按照说明进行操作。", - "zh-cht": "要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。", + "zh-cht": "要安裝軟體，請導航至[[[SERVERURL]]] [[[LINKURL]]]，然後按照說明進行操作。" + }, + { + "en": "To install the software, navigate to [[[SERVERURL]]][[[LINKURL]]][[[URLARGS2]]] and follow the instructions.", "xloc": [ "mesh-invite.txt" ] @@ -37885,7 +37897,10 @@ "ru": "Пользователь [[[USERNAME]]] на сервере [[[SERVERNAME]]] ([[[SERVERURL]]]/) запрашивает установку программного обеспечения для запуска сеанса удаленного управления.", "tr": "[[[SERVERNAME]]] ([[[SERVERURL]]] /) sunucusundaki [[[USERNAME]]] uzaktan kontrol oturumunu başlatmak için yazılım yüklemenizi istiyor.", "zh-chs": "服务器[[[SERVERNAME]]]（[[[SERVERURL]]]/）上的用户[[[USERNAME]]]请求您安装软件以启动远程控制。", - "zh-cht": "伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。", + "zh-cht": "伺服器[[[SERVERNAME]]]（[[[SERVERURL]]] /）上的用戶[[[USERNAME]]]請求你安裝軟體以啟動遠程控制。" + }, + { + "en": "User [[[USERNAME]]] on server [[[SERVERNAME]]] ([[[SERVERURL]]]/[[[URLARGS1]]]) is requesting you install software to start the remote control session.", "xloc": [ "mesh-invite.txt" ] diff --git a/views/message.handlebars b/views/message.handlebars index 3c430c4a..0dec0907 100644 --- a/views/message.handlebars +++ b/views/message.handlebars @@ -47,6 +47,7 @@ var domainurl = decodeURIComponent('{{{domainurl}}}'); var arg1 = decodeURIComponent('{{{arg1}}}'); var arg2 = decodeURIComponent('{{{arg2}}}'); + var urlargs = parseUriArgs(); var title = ''; if (titleid == 1) { title = "Account Verification"; } @@ -70,10 +71,25 @@ case 9: { msg = "ERROR: Invalid account check."; break; } case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; } } - QH('mainMessage', msg + ' ' + "Go to login page" + '.'); + QH('mainMessage', msg + ' ' + "Go to login page" + '.'); 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; }); }; + // Parse URL arguments, only keep safe values + function parseUriArgs() { + var href = window.document.location.href; + if (href.endsWith('#')) { href = href.substring(0, href.length - 1); } + var name, r = {}, parsedUri = href.split(/[\?&|]/); + parsedUri.splice(0, 1); + for (var j in parsedUri) { + var arg = parsedUri[j], i = arg.indexOf('='); + name = arg.substring(0, i); + r[name] = arg.substring(i + 1); + if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } } + } + return r; + } + \ No newline at end of file diff --git a/views/message2.handlebars b/views/message2.handlebars index 95b89747..81b50c50 100644 --- a/views/message2.handlebars +++ b/views/message2.handlebars @@ -48,6 +48,7 @@ var domainurl = decodeURIComponent('{{{domainurl}}}'); var arg1 = decodeURIComponent('{{{arg1}}}'); var arg2 = decodeURIComponent('{{{arg2}}}'); + var urlargs = parseUriArgs(); var title = ''; if (titleid == 1) { title = "Account Verification"; } @@ -61,20 +62,34 @@ case 3: { msg = format("ERROR: Invalid e-mail \"{0}\" for user \"{1}\".", arg1, arg2); break; } case 4: { msg = format("E-mail \"{0}\" for user \"{1}\" already verified.", arg1, arg2); break; } case 5: { msg = format("E-mail \"{0}\" already in use on a different account. Change the email address and try again.", arg1); break; } - case 6: { msg = format("Verified email {0} for user account {1}.", '' + arg1 + '', '' + arg2 + ''); break; } + case 6: { msg = format("Verified email {0} for user account {1}.", '' + arg1 + '', '' + arg2 + ''); break; } case 7: { msg = format("E-mail \"{0}\" for user \"{1}\" not verified.", arg1, arg2); break; } case 8: { - msg = '
' + format("Password for account {0} has been reset to:", '' + arg1 + '') + '
' + arg2 + '
'; + msg = '
' + format("Password for account {0} has been reset to:", '' + arg1 + '') + '
' + arg2 + '
'; msg += "Login and go to the \"My Account\" tab to update your password."; break; } case 9: { msg = "ERROR: Invalid account check."; break; } case 10: { msg = "ERROR: Invalid account check, verification url is only valid for 30 minutes."; break; } } - QH('mainMessage', msg + '

' + "Go to login page" + '.'); + QH('mainMessage', msg + '

' + "Go to login page" + '.'); 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; }); }; + // Parse URL arguments, only keep safe values + function parseUriArgs() { + var href = window.document.location.href; + if (href.endsWith('#')) { href = href.substring(0, href.length - 1); } + var name, r = {}, parsedUri = href.split(/[\?&|]/); + parsedUri.splice(0, 1); + for (var j in parsedUri) { + var arg = parsedUri[j], i = arg.indexOf('='); + name = arg.substring(0, i); + r[name] = arg.substring(i + 1); + if (!isSafeString(r[name])) { delete r[name]; } else { var x = parseInt(r[name]); if (x == r[name]) { r[name] = x; } } + } + return r; + } diff --git a/webserver.js b/webserver.js index 70090bc0..2efc0f47 100644 --- a/webserver.js +++ b/webserver.js @@ -914,7 +914,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() }; obj.db.SetUser(user); parent.debug('web', 'Sending 2FA email to: ' + user.email); - parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req)); + parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key); req.session.messageid = 2; // "Email sent" message req.session.loginmode = '4'; 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) { obj.db.SetUser(user); // Send the verification email - 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)); } + 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); } }, 0); 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 }; 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) { // Send email to perform recovery. delete req.session.tokenemail; if (obj.parent.mailserver != null) { - obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req)); + obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key); if (i == 0) { parent.debug('web', 'handleResetAccountRequest: Hold on, reset mail sent.'); req.session.loginmode = '1'; @@ -1433,7 +1433,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { } else { // No second factor, send email to perform recovery. if (obj.parent.mailserver != null) { - obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req)); + obj.parent.mailserver.sendAccountResetMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key); if (i == 0) { parent.debug('web', 'handleResetAccountRequest: Hold on, reset mail sent.'); req.session.loginmode = '1'; @@ -1517,7 +1517,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { } // Send the verification email - obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req)); + obj.parent.mailserver.sendAccountCheckMail(domain, user.name, user.email, obj.getLanguageCodes(req), req.query.key); // Send the response req.session.messageid = 2; // Email sent. @@ -5308,7 +5308,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() }; obj.db.SetUser(user); parent.debug('web', 'Sending 2FA email to: ' + user.email); - parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req)); + parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key); // Ask for a login token & confirm email was sent try { ws.send(JSON.stringify({ action: 'close', cause: 'noauth', msg: 'tokenrequired', email2fa: email2fa, email2fasent: true, twoFactorCookieDays: twoFactorCookieDays })); ws.close(); } catch (e) { } } else if ((req.query.token == '**sms**') && (sms2fa == true)) { @@ -5413,7 +5413,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) { user.otpekey = { k: obj.common.zeroPad(getRandomEightDigitInteger(), 8), d: Date.now() }; obj.db.SetUser(user); parent.debug('web', 'Sending 2FA email to: ' + user.email); - parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req)); + parent.mailserver.sendAccountLoginMail(domain, user.email, user.otpekey.k, obj.getLanguageCodes(req), req.query.key); // Ask for a login token & confirm email was sent try { ws.send(JSON.stringify({ action: 'close', cause: 'noauth', msg: 'tokenrequired', email2fa: email2fa, email2fasent: true, twoFactorCookieDays: twoFactorCookieDays })); ws.close(); } catch (e) { } } else if ((s[2] == '**sms**') && (sms2fa == true)) {