diff --git a/pages/03.services/02.email/_email-alias/2col.de.md b/pages/03.services/02.email/_email-alias/2col.de.md index 26263cae..b5cdf82a 100644 --- a/pages/03.services/02.email/_email-alias/2col.de.md +++ b/pages/03.services/02.email/_email-alias/2col.de.md @@ -6,22 +6,10 @@ wider_column: right section_id: alias --- -## Email Aliase
und Domain Linking +## Email Domain Linking -Aliase beantragen -Eigene Domain verlinken +Perks --- -Ein Email-Alias ist im Prinzip nichts anderes als eine Art Nachsendeadresse für Deine Emails. - -Mehr Aliase sind verfügbar für regelmäßige Unterstützer. Mit regelmäßigen Unterstützern meinen wir die Community-Mitglieder, die uns mindestens eine Tasse Kaffee im Monat "kaufen". - -Es ist jetzt nicht so, dass wir hier Kaffee anpreisen wollen. Auf der anderen Seite ist Kaffee jedoch eine sehr griffige Analogie für Ausbeutung und [Ungleichheit](http://www.foodispower.org/coffee/)). Wir denken, dies ist eine gute Möglichkeit, jeden selbst bestimmen zu lassen, wie viel er geben kann. -Wir haben diese [Liste](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) gefunden mit Kaffeepreisen rund um die Welt. Die Liste ist vielleicht nicht hundertprozentig korrekt oder gar tagesaktuell, aber Du hast in ihr einen guten Indikator für die verschiedenen Preise. Nimm Dir ruhig Zeit, die Höhe Deines Beitrags abzuwägen. Wenn Du uns einen **Rio de Janeiro**-Kaffee im Monat "kaufen" kannst, ist das OK. Wenn Du Dir jedoch einen *doppelten entkoffeinierten Soja Frappuccino mit einem extra Shot und Sahne* im Monat leisten kannst, dann hilfst Du uns wirklich, die **Disroot**-Plattform am Laufen zu halten und sicherzugehen, dass sie frei zugänglich bleibt für andere Menschen mit weniger Mitteln. - -Um ein Alias zu beantragen, fülle bitte dieses [Formular](/forms/alias-request-form) aus.
-Wenn Du Deine eigene Domain nutzen willst, brauchst Du dieses [Formular](/forms/domain-linking-form). - -Für weitere Informationen, z.B. wie Du Deine neuen Email-Aliase einrichtest, schau Dir unsere [Tutorials](https://howto.disroot.org/de/tutorials/email/alias) an. diff --git a/pages/03.services/02.email/_email-alias/2col.en.md b/pages/03.services/02.email/_email-alias/2col.en.md index f4e73e8f..ba53585c 100644 --- a/pages/03.services/02.email/_email-alias/2col.en.md +++ b/pages/03.services/02.email/_email-alias/2col.en.md @@ -6,21 +6,12 @@ wider_column: right section_id: alias --- -## Email Aliases
and Domain Linking - -Request Aliases -Link Own Domain +## Custom domain linking +
+Request Perks ---
-An email alias is simply a forwarding email address. +This feature is a perk for your financial contribution to the project. It allows you to use your own domain to be able to send and recieve emails. It is a lifetime reward. -More aliases are available for our regular supporters. By regular supporters we think of those who contribute the equivalent of at least one cup of coffee a month. It is not that we are promoting coffee, on the contrary - coffee is actually quite the symbol for exploitation and [inequality](http://www.foodispower.org/coffee/) so we thought that it is a good way to let people measure themselves how much they can give. -We found this [list of coffee cup prices](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) around the world, it might not be very accurate, but it gives a good indication of the different fares. Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means. - - -To request aliases you need to fill in this [form](/forms/alias-request-form).
-If you would like to use your own domain use this [form](/forms/domain-linking-form). - -For information on howto to setup your new email aliases check our [howto section](https://howto.disroot.org/en/tutorials/email/alias). diff --git a/pages/03.services/02.email/_email-alias/2col.es.md b/pages/03.services/02.email/_email-alias/2col.es.md index 2552252c..20b0a188 100644 --- a/pages/03.services/02.email/_email-alias/2col.es.md +++ b/pages/03.services/02.email/_email-alias/2col.es.md @@ -6,22 +6,9 @@ wider_column: right section_id: alias --- -## Alias de correo
y Vinculación de Dominios - -Solicitar Alias -Vincular dominio propio +## Vinculación de Dominios + +Perks --- -
-Un alias de correo es simplemente una dirección de reenvío. - -Hay más alias de correo disponibles para nuestrxs aportantes habituales. Con "aportantes habituales" pensamos en aquellas personas que contribuyen con el equivalente a, por lo menos, una taza de café al mes. -No estamos promoviendo el café, al contrario, pensamos que es, de hecho, un claro ejemplo de lo que es la explotación y la [inequidad](http://www.foodispower.org/coffee/), pero entendemos que es mejor dejar a la gente mensurar por sí misma cuánto pueden dar. -Encontramos esta [lista](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) de precios de tazas de café alrededor del mundo, podría no ser muy precisa, pero da un buen indicio de los diferentes costos. -Por favor, tómate el tiempo para considerar tu contribución. Si puedes 'comprarnos' una taza de café al mes en Río De Janeiro, eso está muy bien. Pero si puedes permitirte pagar un _Café Doble Descafeinado Con Crema extra_ al mes, entonces puedes ayudarnos en serio a mantener funcionando la plataforma **Disroot** y asegurar que esté disponible de manera gratuita para otras personas con menos recursos. - -Para solicitar Alias necesitas completar este [formulario](/forms/alias-request-form).
-Si deseas utilizar tu propio dominio, usa este [formulario](/forms/domain-linking-form). - -Para más información sobre cómo configurar tu nuevo alias de correo, mira en nuestra [sección de manuales](https://howto.disroot.org/es/tutorials/email/alias) diff --git a/pages/03.services/02.email/_email-alias/2col.fr.md b/pages/03.services/02.email/_email-alias/2col.fr.md index b897a72a..5ac1294a 100644 --- a/pages/03.services/02.email/_email-alias/2col.fr.md +++ b/pages/03.services/02.email/_email-alias/2col.fr.md @@ -8,22 +8,7 @@ section_id: alias ## Alias d'email et liaison de domaine -Demande d'alias -Lier votre propre domaine +Perks --- -
-Des alias sont simplement des adresses emails de transfert, utilisées par exemple pour simplifier une adresse mail compliquée. - -Des alias supplémentaires sont disponibles pour nos contributeurs réguliers. Par contributeurs réguliers, nous pensons à ceux qui contribuent l'équivalent d'au moins une tasse de café par mois. -Ce n'est pas que nous faisons la promotion du café, bien au contraire - le café est en fait tout à fait le symbole de l'exploitation et de [l'inégalité](http://www.foodispower.org/coffee/) donc nous avons pensé que c'était une bonne façon de laisser les gens mesurer eux-mêmes combien ils peuvent donner. -Nous avons trouvé cette [liste](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) des prix des tasses de café à travers le monde, elle n'est peut-être pas très précise, mais elle donne une bonne indication des différents tarifs. -Veuillez prendre le temps de réfléchir à votre contribution. Si vous pouvez nous "acheter" une tasse de café Rio De Janeiro par mois, c'est correct, mais si vous avez les moyens d'acheter un double décaféiné Frappuccino au soja avec un extra Shot And Cream par mois, alors vous pouvez vraiment nous aider à maintenir la plateforme **Disroot** en fonctionnement et vous assurer qu'elle est disponible gratuitement pour d'autres personnes avec moins de moyens. - -Pour demander des alias vous devez remplir ce [formulaire](/forms/alias-request-form).
-Si vous souhaitez utiliser votre propre domaine, utilisez ce [formulaire](/forms/domain-linking-form). - -*Si vous avez déjà fait un don pour **Disroot** dans le passé et que vous souhaitez toujours obtenir des alias, veuillez nous contacter.* - -Pour plus d'informations sur la configuration de vos nouveaux alias de courriel, consultez notre [section de guides](https://howto.disroot.org/fr/tutorials/email/alias) diff --git a/pages/03.services/02.email/_email-alias/2col.it.md b/pages/03.services/02.email/_email-alias/2col.it.md index 4268eb81..0299145d 100644 --- a/pages/03.services/02.email/_email-alias/2col.it.md +++ b/pages/03.services/02.email/_email-alias/2col.it.md @@ -8,24 +8,6 @@ section_id: alias ## Email Alias
e collegamento a domini -Richiedi un alias -Collega il tuo dominio +Perks --- - -
- -Gli alias sono disponbili per gli utenti regolari. Con regolari si intende coloro che contribuiscono l'equivalente di almeno una tazza di caffé al mese. - -Non stiamo promuovendo il caffé, al contrario, il caffé simbolizza lo sfruttamento e l'[inuguaglianza](http://www.foodispower.org/coffee/), crediamo però che sia un buon modo di permettere agli utenti di regolarsi nel contributo a **Disroot**. - -Abbiamo trovato [la lista dei prezzi](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) di una tazza di caffé nel mondo. Potrebbe non essere molto accurata ma da una buona indicazione sulla differenza di prezzi. - -Ti chiediamo quindi di valutare quanto donare. Se ti puoi permettere una tazza di caffé a Rio De Janeiro al mese, per noi va bene, ma se ti puoi permettere un Frapuccino doppio decaffeinato di soia con doppia panna al mese, sappi che in questo modo potresti aiutarci in modo importante a far funzionare la piattaforma Disroot ed assicurare il buon funzionamento del progetto anche per chi non ha le tue stesse disponibilità economiche. - -Per richiedere un alias compila questa [form](/forms/alias-request-form).
-Se invece desideri utilizzare un tuo dominio compila questa [form](/forms/domain-linking-form). - -Nel caso avessi già donato in passato a **Disroot** e ti piacerebbe comunque avere degli alias contattaci direttamente. - -Per informazioni su come impostare il tuo nuovo alias guarda la sezione [guide](https://howto.disroot.org/it/tutorials/email/alias) diff --git a/pages/03.services/02.email/_email-alias/2col.ru.md b/pages/03.services/02.email/_email-alias/2col.ru.md index a4e4eb3e..be1c32fd 100644 --- a/pages/03.services/02.email/_email-alias/2col.ru.md +++ b/pages/03.services/02.email/_email-alias/2col.ru.md @@ -8,18 +8,6 @@ section_id: alias ## Почтовые алиасы
и привязка доменов -Запросить алиас -Привязка собственного домена - +Perks --- -
-Псевдоним электронной почты - это просто адрес электронной почты для пересылки. - -Для наших постоянных сторонников доступны альтернативные почтовые псевдонимы. Под постоянными сторонниками мы понимаем тех, кто жертвует хотя бы одну чашку кофе в месяц. Дело не в том, что мы продвигаем кофе, наоборот - кофе на самом деле является символом эксплуатации и [неравенства](http://www.foodispower.org/coffee/ ), поэтому мы подумали, что это хороший способ дать людям возможность измерить сами, сколько они могут дать. -Мы нашли этот [список цен на кофейные чашки](https://www.numbeo.com/cost-of-living/prices_by_country.jsp?itemId=114&displayCurrency=EUR) по всему миру, он может быть не очень точным, но дает хорошее представление о различных тарифах. Пожалуйста, найдите время, чтобы обдумать ваш вклад. Если вы можете «купить» нам одну чашку кофе Рио-де-Жанейро в месяц, это нормально, но если вы можете позволить себе двойной соевый фраппучино без кофеина с дополнительной порцией и сливками в месяц, то вы действительно можете помочь нам сохранить платформу **Disroot** работоспособным и быть уверенным, что она бесплатно доступна для других людей с меньшими средствами. - -Чтобы запросить псевдонимы, вам необходимо заполнить эту [форму](/forms/alias-request-form).
-Если вы хотите использовать свой собственный домен, используйте эту [форму](/forms/domain-linking-form). - -Информацию о том, как настроить новые псевдонимы электронной почты, можно найти в нашем [разделе с инструкциями](https://howto.disroot.org/ru/tutorials/email/alias). diff --git a/pages/forms/domain-linking-form/form.de.md.bak b/pages/forms/domain-linking-form/form.de.md.bak deleted file mode 100644 index 4f680b8c..00000000 --- a/pages/forms/domain-linking-form/form.de.md.bak +++ /dev/null @@ -1,160 +0,0 @@ ---- -title: 'Domain Linking Form' -header_image: netneutrality.jpg -form: - name: Domain-linking-form - fields: - - - name: username - label: 'Benutzername' - placeholder: 'Gib Deinen Disroot-Benutzernamen ein' - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Deine Domain' - placeholder: Deine Domain - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 1' - label: Alias - placeholder: Dein Alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Zweiter Alias (optional)' - placeholder: Dein Alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Dritter Alias (optional)' - placeholder: Dein Alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 4' - label: 'Vierter Alias (optional)' - placeholder: Dein Alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 5' - label: 'Fünfter Alias (optional)' - placeholder: Dein Alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: contribution - label: 'Spenden per' - placeholder: select - type: select - options: - patreon: Patreon - paypal: Paypal - stripe: 'Stripe (creditcard)' - bank: Banküberweisung - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true - - - name: amount - label: Betrag - placeholder: 'EUR/USD/BTC/etc.' - type: text - validate: - pattern: '[A-Za-z0-9., ]*' - required: true - - - name: frequency - label: Zahlweise - type: radio - default: monthly - options: - monthly: Monatlich - yearly: Jährlich - validate: - required: true - - - name: reference - label: Verwendungszweck - type: text - placeholder: 'Name der überweisenden Person oder andere Referenz' - validate: - required: true - - - name: comments - label: Anmerkung - type: textarea - - - name: honeypot - type: honeypot - buttons: - - - type: submit - value: Absenden - - - type: reset - value: Zurücksetzen - process: - - - email: - from: domain-request@disroot.org - to: '{{ form.value.username }}@disroot.org' - subject: '[Disroot] Deine Anfrage auf Domain-Link' - body: '

Hi {{ form.value.username|e }},

Vielen Dank für Deine Spende an Disroot.org!
Wir freuen uns sehr über Deine Großzügigkeit.

Wir werden Deine Anfrage bearbeiten und uns so schnell wie möglich wieder bei Dir melden.


Hier nochmal eine Zusammenfassung Deiner Anfrage:

{% include ''forms/data.html.twig'' %}' - - - email: - from: alias-request@disroot.org - to: '{{ config.plugins.email.to }}' - reply_to: '{{ form.value.username }}@disroot.org' - subject: '[Domain linking request] - {{ form.value.username|e }}' - body: '{% include ''forms/data.html.twig'' %}' - - - save: - fileprefix: feedback- - dateformat: Ymd-His-u - extension: txt - body: '{% include ''forms/data.txt.twig'' %}' - - - message: 'Deine Anfrage auf Domain-Verknüpfung wurde versendet!' - - - display: thankyou ---- - -

Antrag auf Domain-Verknüpfung

-

Füll dieses Formular aus, wenn Du Deine eigene Domain für Email-Aliase nutzen möchtest. -

-Bitte folge diesen Schritten, um Deine Domain auf unseren Server zeigen zu lassen, bevor Du Deine Anfrage einreichst
(dies dient zusätzlich zur Verifizierung, dass die Domain wirklich Dir gehört, und ohne das werden wir Deine Anfrage nicht weiter bearbeiten):

-

1. Gehe in die DNS-Record-Einstellungen für Deine Domain

-

- Richte den MX Eintrag auf disroot.org (wenn Du derzeit Deine Domain mit einem anderen Provider nutzt, setze MX20 oder höher
-- Setze den TXT (spf) Eintrag auf "v=spf1 mx a ptr include:disroot.org ~all"
-- Setze den TXT Eintrag auf "v=spf1 mx ~all"
-

-

2. Beginne zu spenden

-

Das Email-Alias-Feature wird als "Belohnung" für regelmäßige Unterstützer angeboten. Bei regelmäßigen Unterstützern denken wir an diejenigen, die einen Beitrag von mindestens dem Äquivalent einer Tasse Kaffee im Monat leisten. Damit die Belohnung nicht zur einzigen Motivation für eine Spende wird, erwarten wir, dass die Spende ausgeführt wird, bevor wir dieses Feature aktivieren.

-Schau Dir die Spendenseite an, um mehr zu erfahren. -

-

3. Wenn wir Deine Anfrage bearbeitet haben, werden wir Dich kontaktieren, um die Prozedur zu beenden.

-

-Nimm Dir ruhig Zeit, die Höhe Deines Beitrags abzuwägen. Wenn Du uns einen Rio de Janeiro-Kaffee im Monat "kaufen" kannst, ist das OK. Wenn Du Dir jedoch einen Doppelten entkoffeinierten Soja Frappuccino mit einem extra Shot und Sahne im Monat leisten kannst, dann hilfst Du uns wirklich, die Disroot-Plattform am Laufen zu halten und sicherzugehen, dass sie frei zugänglich bleibt für andere Menschen mit weniger Mitteln. -

diff --git a/pages/forms/domain-linking-form/form.en.md b/pages/forms/domain-linking-form/form.en.md index be37adb7..d67b65ff 100644 --- a/pages/forms/domain-linking-form/form.en.md +++ b/pages/forms/domain-linking-form/form.en.md @@ -3,134 +3,128 @@ title: 'Domain Linking Form' header_image: netneutrality.jpg form: name: Domain-linking-form - content: + fields: - - type: section - title: User and domain details: + type: spacer + title: 'User and domain details:' text: "Provide details about your account and domain you want to link to our servers." - underline: true - title_level: h1 + markdown: true - fields: - - - name: username - label: 'User Name' - placeholder: 'Enter your Disroot user name' - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Your domain' - placeholder: example.com - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: xmpp - type: checkbox - label: 'Advanced Do you want to use xmpp chat with your domain? Make sure you are pointing A record to xmpp.disroot.org' - validate: - required: true - - + - + name: username + label: 'User Name' + placeholder: 'Enter your Disroot user name' + autofocus: 'on' + autocomplete: 'on' + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true - - content: + name: Domain + label: 'Your domain' + placeholder: example.com + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true - - type: section - title: Alias information + name: xmpp + type: checkbox + label: 'Advanced Do you want to use xmpp chat with your domain? Make sure you are pointing A record to xmpp.disroot.org' + validate: + required: true + - + type: spacer + title: 'Alias information' text: "Using aliases allows you to create multiple identities for your disroot account which can be used with your custom domain *(eg. john@example.com or nickname@example.com)*. Remember that those are still connected to your single account and you can have maximum of 5 per account. If you want to add additional user accounts to make use of your domain, you need to contact us via email or add additional accounts and aliases you want to add to them in description below. Any additional aliases or changes need to be requested by contacting support until automated solution is provided." - underline: true - title_level: h1 - fields: - - - name: 'Alias 1' - label: Alias - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Second Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Third Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - name: 'Alias 4' - label: 'Forth Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false + name: 'Alias 1' + label: Alias + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: true - - name: 'Alias 5' - label: 'Fifth Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false + name: 'Alias 2' + label: 'Second Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false - - type: display - size: large - label: Donation details - markdown: true - content: "Please provide below details on the donation you have made. Please make sure you do it before you request the domain linking feature. **This information will be removed the moment your request is processed.**" + name: 'Alias 3' + label: 'Third Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false - - name: contribution - label: 'Contributing via' - placeholder: select - type: select - options: - patreon: Patreon - stripe: 'Stripe (creditcard)' - paypal: Paypal - bank: 'Bank transfer' - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true + name: 'Alias 4' + label: 'Forth Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false - - name: amount - label: Amount - placeholder: 'EUR/USD/BTC/etc.' - type: text - validate: - pattern: '[A-Za-z0-9., ]*' - required: true + name: 'Alias 5' + label: 'Fifth Alias (optional)' + placeholder: your-alias + type: text + validate: + pattern: '[A-Za-z0-9.-]*' + required: false - - name: frequency - label: Repeated - type: radio - default: monthly - options: - monthly: Monthly - yearly: Yearly - validate: - required: true + type: spacer + title: Donation details + markdown: true + text: "Please provide below details on the donation you have made. Please make sure you do it before you request the domain linking feature. **This information will be removed the moment your request is processed.**" + - - name: comments - type: textarea + name: contribution + label: 'Contributing via' + placeholder: select + type: select + options: + patreon: Patreon + stripe: 'Stripe (creditcard)' + paypal: Paypal + bank: 'Bank transfer' + faircoin: Faircoin + bitcoin: Bitcoin + validate: + required: true - - name: honeypot - type: honeypot + name: amount + label: Amount + placeholder: 'EUR/USD/BTC/etc.' + type: text + validate: + pattern: '[A-Za-z0-9., ]*' + required: true + - + name: frequency + label: Repeated + type: radio + default: monthly + options: + monthly: Monthly + yearly: Yearly + validate: + required: true + - + name: comments + type: textarea + + - + + name: honeypot + type: honeypot buttons: - type: submit @@ -170,3 +164,4 @@ form: Make sure you followed all the steps needed before you request your domain. Care about your and our time. We review all pending requests once every week so be patient. We will get back to you as soon as we process your request.

+



diff --git a/pages/forms/domain-linking-form/form.en.md.bak b/pages/forms/domain-linking-form/form.en.md.bak deleted file mode 100644 index 8aa79453..00000000 --- a/pages/forms/domain-linking-form/form.en.md.bak +++ /dev/null @@ -1,158 +0,0 @@ ---- -title: 'Domain Linking Form' -header_image: netneutrality.jpg -form: - name: Domain-linking-form - fields: - - - name: username - label: 'User Name' - placeholder: 'Enter your Disroot user name' - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Your domain' - placeholder: your-domain - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 1' - label: Alias - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Second Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Third Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 4' - label: 'Forth Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 5' - label: 'Fifth Alias (optional)' - placeholder: your-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: contribution - label: 'Contributing via' - placeholder: select - type: select - options: - patreon: Patreon - stripe: 'Stripe (creditcard)' - paypal: Paypal - bank: 'Bank transfer' - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true - - - name: amount - label: Amount - placeholder: 'EUR/USD/BTC/etc.' - type: text - validate: - pattern: '[A-Za-z0-9., ]*' - required: true - - - name: frequency - label: Repeated - type: radio - default: monthly - options: - monthly: Monthly - yearly: Yearly - validate: - required: true - - - name: reference - label: Reference - type: text - placeholder: 'Name of payment holder or other transfer reference' - validate: - required: true - - - name: comments - type: textarea - - - name: honeypot - type: honeypot - buttons: - - - type: submit - value: Submit - - - type: reset - value: Reset - process: - - - email: - from: domain-request@disroot.org - to: '{{ form.value.username }}@disroot.org' - subject: '[Disroot] Your domain linking request' - body: '

Hi {{ form.value.username|e }},

Thank you for your contribution to Disroot.org!
We truly appreciate your generosity.

We will review your request and get back to you as soon as we can.


Here is a summary of the received request:

{% include ''forms/data.html.twig'' %}' - - - email: - from: alias-request@disroot.org - to: '{{ config.plugins.email.to }}' - reply_to: '{{ form.value.username }}@disroot.org' - subject: '[Domain linking request] - {{ form.value.username|e }}' - body: '{% include ''forms/data.html.twig'' %}' - - - save: - fileprefix: feedback- - dateformat: Ymd-His-u - extension: txt - body: '{% include ''forms/data.txt.twig'' %}' - - - message: 'Your domain linking request has been sent!' - - - display: thankyou ---- - -

Domain Linking Request

-

Fill in this form if you would like to use your own domain for Email aliases. -

-Please follow these steps to point your domain to our server before you submit the request:
(this will also serve to verify the domain is really owned by you and without that we will not proceed to process your request)

-

1. Go to the DNS records settings for your domain

-

- Point MX record to disroot.org (if you are using your domain currently with other provider, set MX20 or higher)
-- Set TXT record to "v=spf1 mx a ptr include:disroot.org -all"
-

-

2. Start donating

-

The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.

-Check donate page to learn more -

-

3. Once we review your request we will contact you to finalize the procedure

-

-Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the Disroot platform running and make sure it is available for free for other people with less means. -

diff --git a/pages/forms/domain-linking-form/form.es.md.bak b/pages/forms/domain-linking-form/form.es.md.bak deleted file mode 100644 index f0446e14..00000000 --- a/pages/forms/domain-linking-form/form.es.md.bak +++ /dev/null @@ -1,154 +0,0 @@ ---- -title: 'Formulario de vinculación de Dominio' -header_image: netneutrality.jpg -form: - name: Domain-linking-form - fields: - - - name: username - label: 'Nombre de usuario' - placeholder: 'Ingresa tu nombre de usuario de Disroot' - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Tu dominio' - placeholder: tu dominio - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 1' - label: Alias - placeholder: tu alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Segundo Alias (opcional)' - placeholder: tu alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Tercer Alias (opcional)' - placeholder: tu alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 4' - label: 'Cuarto Alias (opcional)' - placeholder: tu alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 5' - label: 'Quinto Alias (opcional)' - placeholder: tu alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: contribution - label: 'Contribuir a través de' - placeholder: select - type: select - options: - patreon: Patreon - paypal: Paypal - stripe: 'Stripe (creditcard)' - bank: 'Transferencia bancaria' - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true - - - name: amount - label: Cantidad - placeholder: 'EUR/USD/BTC/etc.' - type: text - validate: - pattern: '[A-Za-z0-9., ]*' - required: true - - - name: frequency - label: Frecuencia - type: radio - default: monthly - options: - monthly: Mensual - yearly: Anual - validate: - required: true - - - name: reference - label: Referencia - type: text - placeholder: 'Nombre del titular del pago u otras referencias de la transferencia' - validate: - required: true - - - name: comments - type: textarea - - - name: honeypot - type: honeypot - buttons: - - - type: submit - value: Enviar - - - type: reset - value: Reiniciar - process: - - - email: - from: domain-request@disroot.org - to: '{{ form.value.username }}@disroot.org' - subject: '[Disroot] Tu solicitud de vinculación de Dominio' - body: '

Hola {{ form.value.username|e }},

¡Gracias por tu contribución a Disroot.org!
Apreciamos sinceramente tu generosidad.

Revisaremos tu solicitud y te responderemos tan pronto como podamos.


Aquí está un resumen de la solicitud recibida:

{% include ''forms/data.html.twig'' %}' - - - email: - from: alias-request@disroot.org - to: '{{ config.plugins.email.to }}' - reply_to: '{{ form.value.username }}@disroot.org' - subject: '[Domain linking request] - {{ form.value.username|e }}' - body: '{% include ''forms/data.html.twig'' %}' - - - save: - fileprefix: feedback- - dateformat: Ymd-His-u - extension: txt - body: '{% include ''forms/data.txt.twig'' %}' - - - message: '¡Tu solicitud de vinculación de Dominio ha sido enviada!' - - - display: Gracias ---- - -

Solicitud de vinculación de Dominio

-

Completa este formulario si quieres utilizar tu propio dominio para los alias de correo. -

-Por favor, Sigue estos pasos para apuntar tu dominio a nuestro servidor:
(esto también servirá para verificar que el dominio realmente te pertenece)
- 1. Ve a la configuración de registros DNS de tu dominio
- 2. Apunta el registro MX 10 a disroot.org
- 3. Apunta el registro SPF a "v=spf1 mx a ptr include:disroot.org ~all"
- 4. Apunta el registro TXT a "v=spf1 mx ~all"
- 5. Una vez que que revisemos tu solicitud, te contactaremos para finalizar el procedimiento
-
-Por favor, tómate el tiempo para considerar tu contribución. Si puedes 'comprarnos' una taza de café al mes en Río De Janeiro eso está bien, pero si puedes permitirte pagar un Café Doble Descafeinado Con Crema extra al mes, entonces puedes ayurdarnos en serio a mantener la plataforma Disroot corriendo y asegurar que esté disponible de manera gratuita para otras personas con menos recursos. -

diff --git a/pages/forms/domain-linking-form/form.fr.md.bak b/pages/forms/domain-linking-form/form.fr.md.bak deleted file mode 100644 index 813d9d22..00000000 --- a/pages/forms/domain-linking-form/form.fr.md.bak +++ /dev/null @@ -1,159 +0,0 @@ ---- -title: 'Formulaire pour lier un domaine' -header_image: netneutrality.jpg -form: - name: Domain-linking-form - fields: - - - name: username - label: "Nom d'utilisateur" - placeholder: "Entrez votre nom d'utilisateur Disroot" - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Votre domaine' - placeholder: votre-domaine - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 1' - label: Alias - placeholder: votre-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Deuxième Alias (optionnel)' - placeholder: votre-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Troisième Alias (optionnel)' - placeholder: votre-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 4' - label: 'Quatrième Alias (optionnel)' - placeholder: votre-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 5' - label: 'Cinquième Alias (optionnel)' - placeholder: votre-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: contribution - label: 'Contribuant via' - placeholder: sélectionner - type: select - options: - patreon: Patreon - paypal: Paypal - stripe: 'Stripe (Carte de crédit)' - bank: 'Virement bancaire' - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true - - - name: amount - label: Montant - placeholder: 'EUR/USD/BTC/etc.' - type: text - validate: - pattern: '[A-Za-z0-9., ]*' - required: true - - - name: frequency - label: Répété - type: radio - default: monthly - options: - monthly: Mensuellement - yearly: Annuellement - validate: - required: true - - - name: reference - label: Reference - type: text - placeholder: 'Nom du titulaire du paiement ou autre référence de transfert' - validate: - required: true - - - name: comments - type: textarea - - - name: honeypot - type: honeypot - buttons: - - - type: submit - value: Envoyer - - - type: reset - value: Réinitialiser - process: - - - email: - from: domain-request@disroot.org - to: '{{ form.value.username }}@disroot.org' - subject: '[Disroot] Votre demande de lien vers un domaine' - body: "

Bonjour {{ form.value.username|e }},

Merci de votre contribution à Disroot.org!
Nous apprécions vraiment votre générosité.

Nous examinerons votre demande d'alias et vous répondrons dès que possible..


Voici un résumé de la demande reçue:

{% include ''forms/data.html.twig'' %}" - - - email: - from: alias-request@disroot.org - to: '{{ config.plugins.email.to }}' - reply_to: '{{ form.value.username }}@disroot.org' - subject: '[Domain linking request] - {{ form.value.username|e }}' - body: '{% include ''forms/data.html.twig'' %}' - - - save: - fileprefix: feedback- - dateformat: Ymd-His-u - extension: txt - body: '{% include ''forms/data.txt.twig'' %}' - - - message: "Votre demande de lien vers un domaine a été envoyée!" - - - display: Merci ---- - -

Formulaire pour lier un domaine

-

Remplissez ce formulaire si vous souhaitez utiliser votre propre domaine pour les alias Email. -

-Veuillez suivre ces étapes pour diriger votre domaine vers notre serveur avant de soumettre votre demande :
(ceci servira aussi à vérifier que le domaine vous appartient vraiment et sans cela nous ne traiterons pas votre demande)

-

1. Allez dans les paramètres des enregistrements DNS pour votre domaine

. -

- Diriger votre enregistrement MX vers disroot.org (si vous utilisez votre domaine actuellement avec un autre fournisseur, réglez sur MX20 ou plus)
-- Réglez l'enregistrement TXT (spf) ainsi "v=spf1 mx a ptr include:disroot.org ~all"
-- Régler l'enregistrement TXT ainsi "v=spf1 mx ~all"
-

-

2. Commencez à faire un don

-

La fonction d'alias de courriel est offerte sous forme de "récompense" pour les donateurs réguliers. Par donateurs réguliers, nous pensons à ceux qui contribuent par, au moins, l'équivalent d'une tasse de café par mois. Afin que la " récompense " ne devienne pas la seule incitation à faire un don, nous nous attendons à ce que le don soit fait avant que nous puissions activer cette fonction.

-Lisez la page de donation pour en savoir plus. -

-

3. Une fois votre demande examinée, nous vous contacterons pour finaliser la procédure.

-

-Veuillez prendre le temps de réfléchir à votre contribution. Si vous pouvez nous 'acheter' une tasse de café Rio De Janeiro par mois, c'est bien, mais si vous pouvez vous permettre un Frappuccino de soja double décaféiné avec une dose supplémentaire et de la crème tous les mois, vous pouvez réellement nous aider à maintenir la plateforme Disroot et assurer que celle-ci soit accessible gratuitement pour les personnes moins avantagées. -

diff --git a/pages/forms/domain-linking-form/form.it.md.bak b/pages/forms/domain-linking-form/form.it.md.bak deleted file mode 100644 index 1e777359..00000000 --- a/pages/forms/domain-linking-form/form.it.md.bak +++ /dev/null @@ -1,165 +0,0 @@ ---- -title: 'Modulo di collegamento del dominio' -header_image: netneutrality.jpg -form: - name: Domain-linking-form - fields: - - - name: username - label: 'Nome Utente' - placeholder: 'Inserisci il tuo nome utente disroot' - autofocus: 'on' - autocomplete: 'on' - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: Domain - label: 'Il tuo dominio' - placeholder: il-tuo-dominio - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 1' - label: Alias - placeholder: il-tuo-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: true - - - name: 'Alias 2' - label: 'Secondo Alias (facoltativo)' - placeholder: il-tuo-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 3' - label: 'Terzo Alias (facoltativo)' - placeholder: il-tuo-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 4' - label: 'Quarto Alias (facoltativo)' - placeholder: il-tuo-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: 'Alias 5' - label: 'Quinto Alias (facoltativo)' - placeholder: il-tuo-alias - type: text - validate: - pattern: '[A-Za-z0-9.-]*' - required: false - - - name: contribution - label: 'Contributo tramite' - placeholder: select - type: select - options: - patreon: Patreon - paypal: Paypal - stripe: 'Stripe (creditcard)' - bank: 'Bonifico bancario' - faircoin: Faircoin - bitcoin: Bitcoin - validate: - required: true - - - name: amount - label: Importo - placeholder: 'in €, $, BTC etc.' - type: text - validate: - pattern: '[0-9.,]*' - required: true - - - name: frequency - label: Frequenza - type: radio - default: monthly - options: - monthly: Mensile - yearly: Annuale - validate: - required: true - - - name: reference - label: Riferimento - type: text - placeholder: 'Nome del titolare del pagamento o altro riferimento di trasferimento' - validate: - required: true - - - name: comments - type: textarea - - - name: honeypot - type: honeypot - buttons: - - - type: submit - value: Invia - - - type: reset - value: Azzera - process: - - - email: - from: domain-request@disroot.org - to: '{{ form.value.username }}@disroot.org' - subject: '[Disroot] La tua richiesta di collegamento al dominio' - body: '

Hi {{ form.value.username|e }},

Grazie per il tuo contributo a Disroot.org!
Apprezziamo davvero la sua generosità.

Esamineremo la vostra richiesta e vi risponderemo appena possibile.


Ecco una sintesi della richiesta ricevuta:

{% include ''forms/data.html.twig'' %}' - - - email: - from: alias-request@disroot.org - to: '{{ config.plugins.email.to }}' - reply_to: '{{ form.value.username }}@disroot.org' - subject: '[Domain linking request] - {{ form.value.username|e }}' - body: '{% include ''forms/data.html.twig'' %}' - - - save: - fileprefix: feedback- - dateformat: Ymd-His-u - extension: txt - body: '{% include ''forms/data.txt.twig'' %}' - - - message: 'La sua richiesta di collegamento al dominio è stata inviata!' - - - display: grazie ---- - -

Richiesta di collegamento di dominio

-

Compila questo modulo se desideri utilizzare il tuo dominio per gli alias e-mail. -

-Segui questi passi per puntare il tuo dominio al nostro server prima di procedere con la richiesta: - -
(Questo servirà per verificare che il dominio sia veramente di tua proprietà. Senza questo step non procederemo alla tua richiesta)

-

1. Vai nelle impostazioni DNS records del tuo dominio

-

- Punta MX record su disroot.org (se stai utilizzando il tuo dominio con un altro provider, imposta MX20 o superiore))
-- Imposta TXT (spf) record su "v=spf1 mx a ptr include:disroot.org ~all"
-- Imposta TXT record su "v=spf1 mx ~all"
-

-

2. Fai una donazione

-

L'alias email è offerto come "ricompensa" per i sostenitori regolari. Come sostenitori regolari intendiamo coloro che contribuiscono con almeno l'equivalente di una tazza di caffè al mese.

-Controlla pagina di donazione per saperne di più. - -

-

3. Una volta esaminata la tua richiesta ti contatteremo per finalizzare la procedura.

-

- - -
-Per favore, prenditi il tempo per considerare il tuo contributo. Se puoi 'comprarci' una tazza di caffè Rio De Janeiro al mese va bene, ma se puoi permetterti un Frappuccino di soia a doppio decaffeinato con extra e crema al mese, allora puoi davvero aiutarci a mantenere in funzione la piattaforma Disroot e assicurarti che sia disponibile gratuitamente per altre persone con meno mezzi. -

diff --git a/pages/forms/domain-linking-form/thankyou/formdata.de.md b/pages/forms/domain-linking-form/thankyou/formdata.de.md deleted file mode 100644 index a1dfbdce..00000000 --- a/pages/forms/domain-linking-form/thankyou/formdata.de.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 'Domain linking requested' -process: - markdown: true - twig: true -cache_enable: false ---- - -

**Abhängig von unserer Arbeitsbelastung kann es bis zu zwei Wochen dauern, bis wir Deine Anfrage bearbeiten können. Wir bitten um Verständnis, an einer Verbesserung für die Zukunft arbeiten wir bereits.** -
-
-
-**Hier nochmal eine Zusammenfassung der empfangenen Anfrage:** diff --git a/pages/forms/domain-linking-form/thankyou/formdata.en.md b/pages/forms/domain-linking-form/thankyou/formdata.en.md index 6640b3c4..24d97406 100644 --- a/pages/forms/domain-linking-form/thankyou/formdata.en.md +++ b/pages/forms/domain-linking-form/thankyou/formdata.en.md @@ -1,12 +1,12 @@ --- -title: 'Vinculación de Dominio solicitada' +title: 'Thanks for your request' process: markdown: true twig: true cache_enable: false --- -

**Depending on our workload it might take even two weeks to review your request. We are working to improve that in the future.** +

**Depending on our workload it might take even two weeks to review your request, though we are doing our best to review requests weekly.**

diff --git a/pages/forms/domain-linking-form/thankyou/formdata.es.md b/pages/forms/domain-linking-form/thankyou/formdata.es.md deleted file mode 100644 index fd02379c..00000000 --- a/pages/forms/domain-linking-form/thankyou/formdata.es.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 'Domain linking requested' -process: - markdown: true - twig: true -cache_enable: false ---- - -

**Dependiendo de la carga de trabajo que tengamos, podría llevarnos hasta dos semanas revisar tu solicitud. Estamos trabajando para mejorar eso en el futuro.** -
-
-
-**Aquí está un resumen de la solicitud recibida:** diff --git a/pages/forms/domain-linking-form/thankyou/formdata.fr.md b/pages/forms/domain-linking-form/thankyou/formdata.fr.md deleted file mode 100644 index 3e136661..00000000 --- a/pages/forms/domain-linking-form/thankyou/formdata.fr.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: 'Alias demandés' -cache_enable: false -process: - twig: true ---- - -

**Selon notre charge de travail, l'examen de votre demande peut prendre jusqu'à deux semaines. Nous nous efforçons de l'améliorer à l'avenir..** -
-
-
-**Voici un résumé de la demande reçue:** diff --git a/pages/forms/domain-linking-form/thankyou/formdata.it.md b/pages/forms/domain-linking-form/thankyou/formdata.it.md deleted file mode 100644 index 6d771630..00000000 --- a/pages/forms/domain-linking-form/thankyou/formdata.it.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 'Collegamento dominio richiesto' -process: - markdown: true - twig: true -cache_enable: false ---- - -

**A seconda del nostro carico di lavoro, potrebbero essere necessarie anche due settimane per esaminare la vostra richiesta. Stiamo lavorando per migliorare questo aspetto in futuro.** -
-
-
-**Ecco una sintesi della richiesta ricevuta:**