Disroot/Website
Disroot
/
Website
14
15
Fork 14
Code Pull Requests 2 Releases Activity

Improve language in the English pages for email, git hosting and the contact page (#473) 

Let me know if there's anything that could be written better. <3

Co-authored-by: meaz <meaz@no-reply@disroot.org>
Reviewed-on: #473
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: Jeremy Baxter <jtbx@disroot.org>
Co-committed-by: Jeremy Baxter <jtbx@disroot.org>
This commit is contained in:
Jeremy Baxter 2024-03-24 15:57:58 +00:00 committed by meaz
parent ec8f91cafd
commit 3bdc0b40a5
12 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pages/03.services/02.email/_email-alias/2col.en.md
View File

@ -13,4 +13,4 @@ section_id: alias
---
<br>
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 receive emails. It is a lifetime reward.
This feature is a lifetime bonus for those who make a financial contribution to the project. It allows you to send and receive emails using your own domain name.

6
pages/03.services/02.email/_email-clients_header/fullbar.en.md
View File

@ -6,9 +6,9 @@ text_align: center
---
<br>
# Use your favorite Email client
There are a lot of desktop/mobile email clients to choose from. Pick the one you like the best.<br>
# Use your favorite email client
There are many desktop/mobile email clients to choose from. Pick the one you like the best.<br>
Check our [Howto page](https://howto.disroot.org/en/tutorials/email/clients) for details on how to setup your favourite clients.
Check our [Howto page](https://howto.disroot.org/en/tutorials/email/clients) for details on how to set up Disroot's email with your favourite clients.
<br>
*Check the settings on top of this page to set up your* **Disroot** *email on your device. These settings are standard information that tells your email client how to reach* **Disroot**'*s email server.*

4
pages/03.services/02.email/_email-encryption/2col.en.md
View File

@ -10,10 +10,10 @@ wider_column: right
---
Encryption is when you change data with a special encoding process so that the data becomes unrecognizable (it's encrypted). You can then apply a special decoding process and you will get the original data back. By keeping the decoding process a secret, nobody else can recover the original data from the encrypted data.
Encryption is when you change data with a special encoding process so that the data becomes unrecognizable; it's encrypted. You can then apply a special decoding process and you will get the original data back. By keeping the decoding process a secret, nobody else can recover the original data from the encrypted data.
[Video - How asymmetric encryption works](https://invidious.snopyta.org/E5FEqGYLL0o)
<br>
![mailvelope](en/mailvelope.svg?resize=150)
You can use Mailvelope, a browser add-on in Chrome, Edge and Firefox, that securely encrypts your emails with PGP using Disroot webmail. Check this [howto](https://mailvelope.com/en/help).
Mailvelope is a browser add-on for Chrome, Edge and Firefox that securely encrypts your emails with PGP using Disroot webmail. Check this [guide](https://mailvelope.com/en/help) for more details.

5
pages/03.services/02.email/_email-settings/fullbar.en.md
View File

@ -14,8 +14,9 @@ text_align: center
---
**Mailbox size limit:** 1 GB
**Attachement size limit:** 64 MB
**Attachment size limit:** 64 MB
---
**Delimiters:** You can use delimiters (plus sign, "+") in your email address to create sub-addresses, like **username+whatever@disroot.org**, for example to filter and track spam. Example: david@disroot.org can set up mail addresses like 'david+bank@disroot.org' that he could give to his bank. It can be used to send and receive emails.
**Delimiters:** The plus sign ("+") can be used as a delimiter in your email address to create sub-addresses, e.g. **username+whatever@disroot.org**. This can be used, for instance, to filter and track spam.
Example: david@disroot.org could have an email address like 'david+bank@disroot.org' that he could give to his bank. It can be used to send and receive emails. These addresses do not need to be manually configured; they are always routed back to the original mailbox.

16
pages/03.services/02.email/_email-webmail/2col.en.md
View File

@ -12,20 +12,20 @@ wider_column: right
---
<br>
You can access your mail from any devices by using our webmail at [https://webmail.disroot.org](https://webmail.disroot.org)
You can access your email from any device by using our hosted webmail at [https://webmail.disroot.org](https://webmail.disroot.org)
Our webmail is powered by **Roundcube**. Roundcube is a modern approach to webmail. It's simple, fast and provides most of the features one could expect from webmail:
<ul class=disc>
<li>A nice responsive skin: a beautiful Disroot flavor skin with multi-device support.</li>
<li>Translations: the interface is translated in more than 80 languages.</li>
<li>Drag-&-drop message management: move your messages with your mouse.</li>
<li>Translations: user interface is available in more than 80 languages.</li>
<li>Drag-and-drop message management: easily move your messages with your mouse.</li>
<li>Full support for MIME and HTML messages.</li>
<li>Attachment previews: see the images directly within your messages.</li>
<li>Threaded message listing: Display conversations in a threaded mode.</li>
<li>Filters: Set up rules to automatically move or copy email to specific folders, forward or reject emails, according to subject, sender, etc.</li>
<li>Folders: Manage your folders (add, remove, or hide).</li>
<li>Attachment previews: see images directly within messages.</li>
<li>Threaded message listing: display conversations in a threaded fashion.</li>
<li>Filters: set up rules to automatically move or copy email to specific folders, as well as forwarding or rejecting emails (according to the subject, sender, etc.)</li>
<li>Folder management: add, remove, or hide your folders.</li>
</ul>
Project Homepage: [https://roundcube.net](https://roundcube.net)
Project homepage: [https://roundcube.net](https://roundcube.net)

8
pages/03.services/02.email/_email-x-storage/2col.en.md
View File

@ -1,5 +1,5 @@
---
title: 'Extra mailbox Storage'
title: 'Extra mailbox storage'
bgcolor: '#FFF'
fontcolor: '#555'
wider_column: left
@ -7,9 +7,9 @@ section_id: storage
---
## Add storage to your mailbox
If the FREE 1GB is not enough, you can extend your E-mail storage.
If the free 1GB is not enough, you can extend your email storage.
Here are the prices **per year, payment fees included**:
Here are the prices **per year** (payment fees included):
||||
|---:|---|---:|
@ -22,7 +22,7 @@ Here are the prices **per year, payment fees included**:
<br>
Transactions within the EU are subjected to extra VAT (Value Added Tax) of 21%.
Transactions made within the EU are subjected to extra VAT of 21%.
---

4
pages/03.services/02.email/_email/2col.en.md
View File

@ -14,6 +14,6 @@ wider_column: right
## E-mail
**Disroot** provides secure email accounts for your desktop client or via a web interface. The communication between you and the mail server is encrypted with SSL, providing as much privacy as possible. Furthermore, all the emails being sent out from our server are encrypted as well (TLS) if the recipients email server supports it. This means that emails are no longer sent as traditional "postcard", but are actually put in an "envelope".
**Disroot** provides secure email accounts for your desktop or mobile email client, or via our webmail. The communication between your device and the mail server is encrypted with SSL, providing as much privacy as possible. Furthermore, all emails sent out from our server are TLS encrypted if the recipient's email server supports it. This means that emails are no longer sent as a "postcard", but are actually put in an "envelope".
**Nevertheless, we encourage you to always be cautious when using email communication, and to make use of GPG end-to-end encryption to ensure your correspondence is as private as can be.**
**Nevertheless, we encourage you to be cautious when communicating using email, and to make use of GPG end-to-end encryption to ensure your communication is as secure and private as possible.**

8
pages/03.services/15.git/_forgejo-features1/2col.en.md
View File

@ -4,16 +4,16 @@ wider_column: left
---
## Easy to use
Check the public repositories, find the one you want to work on and clone it on your computer. Or create your own! You can set it as a public or as a private repository.
Explore public repositories, find the one you want to work on and clone it on your computer. Or create your own! You can make it either public or private.
## Fast and lightweight
**Forgejo** offers very fast and light experience. No bloated, over-engineered feature set. Only things that are essential to collaborate on your open source project!
**Forgejo** offers a very fast and light experience. There isn't any bloated, over-engineered feature set. Only things that are essential to collaborate on your open source project!
## Notifications
Receive emails when an issue was solved, a pull request created, etc.
Receive emails when an issue was solved, a new pull request was opened, someone replied to a thread, etc.
## Secure
Use ssh key, two factor authentication and GnuPG to secure your repository.
Use an SSH key, two factor authentication and GnuPG to secure your repository.
---

10
pages/03.services/15.git/_forgejo-features2/2col.en.md
View File

@ -11,13 +11,13 @@ wider_column: left
---
## Issue tracking
Manage issues, feature request and feedback to your projects.
Manage bug reports, feature requests and feedback to your projects.
## Tags, assignee, milestones, comments
Manage your repository efficiently by easily determining your milestones, sort your issues, discuss and assign your tasks to fellow team members.
## Tags, assignees, milestones, comments
Manage your repository efficiently by easily determining your milestones, sorting out your issues, and discussing and assigning tasks to fellow team members.
## Wiki
Create a wiki to explain your project, and use Markdown.
Create a wiki to document your project, and use Markdown to write it.
## Mobile app
Manage your project on the go with Android mobile app (available on F-Droid).
Manage your project on the go with the Android mobile app (available on F-Droid).

6
pages/03.services/15.git/_forgejo/2col.en.md
View File

@ -17,9 +17,9 @@ wider_column: right
## Forgejo
**Disroot's Git** is powered by **Forgejo**. **Forgejo** is a community driven, powerful, easy to use and lightweight solution to code hosting and project collaboration. It's build around GIT technology which is the most widely used modern version control system in the world today.
**Disroot's Git** service is powered by **Forgejo**. **Forgejo** is a community driven, lightweight, powerful, and easy to use solution to code hosting and project collaboration. It's built around the Git version control system which is the most widely used version control system in the world today.
Disroot Git: [https://git.disroot.org](https://git.disroot.org)
Disroot's Git service: [https://git.disroot.org](https://git.disroot.org)
Project homepage: [https://forgejo.org/](https://forgejo.org/)
@ -27,4 +27,4 @@ Source code: [https://codeberg.org/forgejo/forgejo](https://codeberg.org/forgejo
<hr>
You need to create a seperate account on [git.disroot.org](https://git.disroot.org/) to use this service. **Disroot** account credentials are not supported.
You will need to create a separate account on [git.disroot.org](https://git.disroot.org/) to use this service. **Disroot** account credentials are not supported.

4
pages/04.contact/_contact/2col.en.md
View File

@ -9,8 +9,8 @@ twig_first: false
wider_column: right
---
## How to contact us?
## How to contact us
---
If you would like to send us a feedback, have a question, would like to get in touch, or simply bitch about our poor services and support:
If you would like to send us feedback, have a question, would like to get in touch, or simply whine about our poor services/support, please feel free to ask using any of the services below.

8
pages/04.contact/_links/2col.en.md
View File

@ -18,13 +18,13 @@ twig_first: false
![](irc.png?classes=contact) IRC: #disroot on irc.libera.chat
[![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) Xmpp: <a class="lighter" href="xmpp:disroot@chat.disroot.org?join">disroot@chat.disroot.org/@disroot</a>
[![](xmpp.png?classes=contact)](xmpp:disroot@chat.disroot.org?join) XMPP: <a class="lighter" href="xmpp:disroot@chat.disroot.org?join">disroot@chat.disroot.org/@disroot</a>
[![](webchat.png?classes=contact)](https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org) Xmpp <a class="lighter" href="https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org">webchat</a>
[![](webchat.png?classes=contact)](https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org) XMPP <a class="lighter" href="https://webchat.disroot.org/#converse/room?jid=disroot@chat.disroot.org">webchat</a>
[![](nextcloud.png?classes=contact)](https://cloud.disroot.org/call/di5y9zno
) NextCloud: <a class="lighter" href="https://cloud.disroot.org/call/di5y9zno">cloud.disroot.org/call/di5y9zno</a>
) Nextcloud: <a class="lighter" href="https://cloud.disroot.org/call/di5y9zno">cloud.disroot.org/call/di5y9zno</a>
---
All listed chatrooms are bridged together. This means that no matter which chatroom from this list you choose, you will be able to communicate with all the community via a chat relay bot.
All listed chatrooms are bridged together, meaning that no matter what chatroom from this list you choose, you will be able to communicate with the entire community via a chat relay bot.