From 0ef49806f3ca84a2056c354d6bfe035764b9fc06 Mon Sep 17 00:00:00 2001 From: shadowsword Date: Sun, 17 Nov 2019 21:32:28 +0100 Subject: [PATCH 1/2] small fixes in english version --- pages/02.tutorials/03.Email/01.Alias/docs.en.md | 1 + .../03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pages/02.tutorials/03.Email/01.Alias/docs.en.md b/pages/02.tutorials/03.Email/01.Alias/docs.en.md index 09c2af37d..24bb2e2ac 100755 --- a/pages/02.tutorials/03.Email/01.Alias/docs.en.md +++ b/pages/02.tutorials/03.Email/01.Alias/docs.en.md @@ -21,4 +21,5 @@ Once you requested email aliases using this [form](https://disroot.org/en/forms/ - [Webmail](webmail) - [Thunderbird](thunderbird) - [K9](k9) +- [FairEmail](fairemail) - [Mail iOS](mailios) diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md index b6558f993..f2bee9f07 100644 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md @@ -20,7 +20,7 @@ page-toc: # About FairEmail -**[FairEmail](https://email.faircode.eu/)**, created by Marcel Bokhorst, the developer of NetGuard an XPrivacyLua, is a free, open source and feature rich mail client for android. Meanwhile **FairEmail** outrankend even the classic K-9 Mail (personal opinion), but this is a matter of taste, of course. Without doubt **FairEmail** is definitely one of the best **FLOSS**-clients available. We definitely recommend you to give it a try. Some features and advantages: +**[FairEmail](https://email.faircode.eu/)**, created by Marcel Bokhorst, the developer of NetGuard and XPrivacyLua, is a free, open source and feature rich mail client for android. Meanwhile **FairEmail** outrankend even the classic K-9 Mail (personal opinion), but this is a matter of taste, of course. Without doubt **FairEmail** is definitely one of the best **FLOSS**-clients available. We definitely recommend you to give it a try. Some features and advantages: - works with IMAP and POP3 - folder synchronisation @@ -53,7 +53,7 @@ When you start the app for the first time, you need to accept the license agreem ... and choose *Other provider* -![](de/fairemail_setup_03.png) +![](en/fairemail_setup_03.png) 2. **Fill in credentials**
Fill in your **screen name**, your **Disroot mail address** and your **password**. @@ -105,6 +105,6 @@ By tapping on your account you will get to the folder view. ![](en/fairemail_setup_15.png). 5. **(optional) More settings**
-**FairEmail** has a lot of customization option. Too much to explain them all here. Just play around a bit and find out, what fits your taste. You will find out quickly, that the user interface of **FairEmail** is very intuitive. +**FairEmail** has a lot of customization options. Too much to explain them all here. Just play around a bit and find out what fits your taste. You will find out quickly, that the user interface of **FairEmail** is very intuitive. If questions about some features of **FairEmail** will pile up, we may of course add some explanation to this tutorial in the future. From 0498d1638ee51d79d47117aa9f7d54221c1cc459 Mon Sep 17 00:00:00 2001 From: shadowsword Date: Wed, 20 Nov 2019 19:18:18 +0100 Subject: [PATCH 2/2] Deleted the 'personal opinion' part at fairemail and k9 in german and english version --- .../03.Email/04.Clients/02.Mobile/01.k9/docs.de.md | 2 +- .../03.Email/04.Clients/02.Mobile/01.k9/docs.en.md | 3 ++- .../03.Email/04.Clients/02.Mobile/04.fairemail/docs.de.md | 2 +- .../03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md | 2 +- pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.de.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.de.md index 70b526a3f..009ff7423 100644 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.de.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.de.md @@ -20,7 +20,7 @@ page-toc: # K9 für Android -**[K9](https://de.wikipedia.org/wiki/K-9_Mail)** ist ein freier, quelloffener und funktionsreicher Mail-Client für Android. Lange Zeit war K9 besser als alles Andere da draußen, inklusive Desktop-Clients (persönliche Meinung). Mittlerweile haben andere Entwickler nachgelegt, nichtsdestotrotz gehört **K9 Mail** immer noch zu den besten **FOSS**-Clients, die es gibt. Wir raten Dir auf jeden Fall, ihn mal auszuprobieren. Einige Funktionen: +**[K9](https://de.wikipedia.org/wiki/K-9_Mail)** ist ein freier, quelloffener und funktionsreicher Mail-Client für Android. Was **FLOSS** angeht ist **K-9 Mail**, ebenso wie [**FairEmail**](/tutorials/email/clients/mobile/fairemail), sicherlich eine der beliebtesten Email-Apps für **Android**. Einige Funktionen: - Funktioniert mit IMAP, POP3 und Exchange 2003/2007 - Ordner-Synchronisation diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.en.md index d92860f8e..a601b83b4 100755 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.en.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/01.k9/docs.en.md @@ -14,7 +14,8 @@ page-toc: # K9 for Android -**[K9](https://en.wikipedia.org/wiki/K-9_Mail)** is independent, feature-rich Free/Open Source mail client for android. It beats anything out there, including desktop applications (personal opinion). We very much advise giving it a try. Some features: +**[K9](https://en.wikipedia.org/wiki/K-9_Mail)** is independent, feature-rich Free/Open Source mail client for android. Concerning **FLOSS**, **K-9 Mail**, just like [**FairEmail**](/tutorials/email/clients/mobile/fairemail), surely is one of the most popular email clients for **Android**. Some features: + - Works with IMAP, POP3 and Exchange 2003/2007 (with WebDAV) accounts - Folder Sync - Encryption with APG/OpenKeychain support diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.de.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.de.md index 5cb2e0e9e..45a9d3372 100644 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.de.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.de.md @@ -20,7 +20,7 @@ page-toc: # Über FairEmail -**[FairEmail](https://email.faircode.eu/)**, aus der Feder von Marcel Bokhorst, dem Entwickler von NetGuard und XPrivacyLua, ist ein freier, quelloffener und funktionenreicher Mail-Client für Android. Mittlerweile hat FairEmail sogar dem Klassiker [K-9 Mail](/tutorials/email/clients/k9) den Rang abgelaufen (persönliche Meinung). Das ist natürlich Geschmackssache, ohne Zweifel gehört **FairEmail** jedoch zu den besten **FOSS**-Clients, die es gibt. Wir raten Dir auf jeden Fall, ihn mal auszuprobieren. Einige Funktionen und Vorteile: +**[FairEmail](https://email.faircode.eu/)**, aus der Feder von Marcel Bokhorst, dem Entwickler von NetGuard und XPrivacyLua, ist ein freier, quelloffener und funktionenreicher Mail-Client für Android. Was **FLOSS** angeht ist **FairEmail** sicherlich, ebenso wie [K-9 Mail](/tutorials/email/clients/mobile/k9) eine der beliebtesten Email-Apps für Android. Einige Funktionen und Vorteile: - Funktioniert mit IMAP und POP3 - Ordner-Synchronisation diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md index f2bee9f07..60bdb8c37 100644 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/04.fairemail/docs.en.md @@ -20,7 +20,7 @@ page-toc: # About FairEmail -**[FairEmail](https://email.faircode.eu/)**, created by Marcel Bokhorst, the developer of NetGuard and XPrivacyLua, is a free, open source and feature rich mail client for android. Meanwhile **FairEmail** outrankend even the classic K-9 Mail (personal opinion), but this is a matter of taste, of course. Without doubt **FairEmail** is definitely one of the best **FLOSS**-clients available. We definitely recommend you to give it a try. Some features and advantages: +**[FairEmail](https://email.faircode.eu/)**, created by Marcel Bokhorst, the developer of NetGuard and XPrivacyLua, is a free, open source and feature rich mail client for android. Concerning **FLOSS*, **FairEmail**, just like [**K-9 Mail**](/tutorials/email/clients/mobile/k9), surely is one of the most popular email clients for **Android**. Some features and advantages: - works with IMAP and POP3 - folder synchronisation diff --git a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md index 29546f014..6d989af97 100755 --- a/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md +++ b/pages/02.tutorials/03.Email/04.Clients/02.Mobile/docs.en.md @@ -18,6 +18,7 @@ How-to setup your email with your mobile device: ## Android - [K9](k9) +- [FairEmail](fairemail) ## SailfishOS - [Mail App](sailfishos)