Merge branch 'english' into 'master'

English

Typo in the English pages.
A couple of correction and addition to the French pages (I'm sorry, I chose the wrong branch!)

See merge request !34

pages/02.nextcloud/docs.fr.md

@@ -4,5 +4,9 @@ published: true
 taxonomy:
     category:
         - docs
-
+page-toc:
+    active: false
 ---
+
+
+<br> 

pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.en.md

@@ -19,7 +19,7 @@ page-toc:
 Here is how you setup disroot account on K9.
 
 #Get it
-First of, **get K9 on your phone**. We encourage you to use [F-Droid](https://f-droid.org/) store (it's a store hosting only free and open source applications), but you can get it also via g*** store. (additionally you can get **Matrial K9** version or **P=9** which supports GPG by default)
+First of, **get K9 on your phone**. We encourage you to use [F-Droid](https://f-droid.org/) store (it's a store hosting only free and open source applications), but you can get it also via g*** store. (additionally you can get **Material K9** version or **P=P** which supports GPG by default)
 # Set it up
 Once you start the application for the first time, you need to **create new account**.
 1. **Fill in your disroot's email address and password**

pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.fr.md

@@ -0,0 +1,55 @@
+---
+title: Android - K9
+published: true
+visible: false
+taxonomy:
+    category:
+        - docs
+page-toc:
+    active: false
+---
+
+[K9](https://en.wikipedia.org/wiki/K-9_Mail) est un client de messagerie indépendant et riche en fonctionnalités pour Android. Il bat n'importe quoi, y compris les applications de bureau (avis personnel). Nous vous conseillons vivement d'essayer. Quelques fonctionnalités:
+- Fonctionne avec les comptes IMAP, POP3 et Exchange 2003/2007 (avec WebDAV)
+- Synchronisation de dossiers
+- Chiffrement avec la prise en charge de SGA/OpenKeychain
+- Signatures
+- Stockage sur carte SD
+
+Voici comment configurer le compte de disroot sur K9.
+
+# Obtenez-le
+D'abord, **récupérez K9 sur votre téléphone**. Nous vous encourageons à utiliser le magasin [F-Droid](https://f-droid.org/) (c'est un magasin hébergeant uniquement des applications libres et open source), mais vous pouvez aussi l'obtenir via g*** store. (en plus vous pouvez obtenir la version **Material K9** ou **P=P** qui supporte GPG par défaut)
+# Le régler
+Une fois que vous lancez l'application pour la première fois, vous devez **créer un nouveau compte**.
+1. Remplissez l'adresse email et le mot de passe Disroot.
+
+![](en/android-k9_1.png)
+
+2. **Choisissez** quel **protocole** vous voulez utiliser. Nous vous recommandons d'utiliser **IMAP**
+
+![](en/android-k9_2.png)
+
+3. **Configuration de l' e-mail entrant ***
+Regardez les paramètres de messagerie et ajustez-les en conséquence. (la seule chose que vous devez changer est *mail.disroot.org* en **disroot.org**). Vérifiez la capture d'écran ou suivez les [informations générales de configuration du serveur](https://howto.disroot.org/pt/email/email-clients)
+
+![](en/android-k9_3.png)
+
+4. **Configuration du courrier électronique sortant**
+Comme pour le courrier entrant. S'il vous plaît, assurez-vous que:
+ - Le serveur SMTP est **disroot.org**
+ - La sécurité, c'est **STARTTLS**
+ - Le port est **587*****.
+Vérifier la capture d'écran comme référence ou vérifier [les informations générales sur la configuration du serveur](#Other)
+
+![](en/android-k9_4.png)
+
+5. **Paramétrage du compte.**
+Ajustez la fréquence avec laquelle K9 vérifiera les nouveaux courriels et comment il vous avisera à leur sujet.
+
+6. Enfin, donnez à votre **compte** un **nom**.
+
+7. **Terminé!**
+Profitez de votre e-mail Disroot open source sur votre appareil Android.
+
+![](en/android-k9_5.png) ![](en/android-k9_6.png)

pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.fr.md

@@ -0,0 +1,30 @@
+---
+title: Client de messagerie iOS
+published: true
+visible: false
+taxonomy:
+    category:
+        - docs
+---
+
+1. Ouvrez la configuration de votre appareil iOS et allez dans 'Courrier, Contacts, Calendriers'. Sélectionnez ensuite "Ajouter un compte".
+
+![](en/ios_mail1.PNG)
+
+2. Sélectionnez "Autre".
+
+![](en/ios_mail2.PNG)
+
+3. Sélectionnez "Ajouter un compte de messagerie".
+
+![](en/ios_mail3.PNG)
+
+4. Insérez vos identifiants et cliquez sur 'Suivant'.
+
+![](en/ios_mail4.PNG)
+
+5. Changez le nom d'hôte en disroot org, pour le serveur de messagerie à la fois entrant et sortant.
+
+![](en/ios_mail5.PNG)
+
+Cliquez sur 'Suivant' et votre compte devrait être prêt à être utilisé dans votre client de messagerie iOS.

pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.en.md

@@ -39,7 +39,7 @@ Setting up disroot mail on SailfishOS is very easy. Just follow those simple ste
 
 ![](en/sailfish_mail4.png)
 
-6. Swipe "**Accept**"<p>
+6. Swipe "**Accept**"
 
 7. Edit details such as **description** and "**Your name**", and swipe "**Accept**"
 

pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.fr.md

@@ -0,0 +1,48 @@
+---
+title: Client de messagerie SailfishOS
+published: true
+visible: false
+taxonomy:
+    category:
+        - docs
+---
+
+La mise en place du courrier Disroot sur SailfishOS est très facile. Suivez ces simples étapes. (il a fallu plus de temps pour faire ces captures d'écran sophistiquées :P )
+
+
+1. Ouvrir l'application **Paramètres**
+
+2. Allez jusqu'en bas (Sailfish2.0) jusqu' à l'onglet **Comptes**.
+
+3. Sélectionnez **Courriel général**
+
+![](en/sailfish_mail1.png)
+
+4. Entrez votre adresse e-mail et votre mot de passe, puis cliquez sur "Accepter".
+
+![](en/sailfish_mail2.png)
+
+5. Paramètres du serveur.
+
+ - **Serveur de courrier entrant:**
+    - Modifier le nom d'utilisateur et **supprimer le domaine en ne laissant que le nom d'utilisateur**.
+    - Ajouter l'adresse du serveur: **disroot.org**
+    - **Activer la connexion SSL**
+
+![](en/sailfish_mail3.png)
+
+- **Serveur de courrier sortant**
+   - Adresse du serveur: **disroot.org**
+   - Connexion sécurisée: **StartTLS**
+   - Port: **587**
+   - **Authentification requise**
+
+![](en/sailfish_mail4.png)
+
+6. Glisser "**Accepter**"
+
+7. Modifiez des détails tels que **description** et "**Votre nom**", et glissez "**Accepter**".
+
+![](en/sailfish_mail5.png)
+
+**Vous avez fini!** \o/

pages/07.Polls/docs.en.md

@@ -30,7 +30,7 @@ The main differences between "Schedule an event" and "Make a standard poll" are:
 
 * **Standard poll** is better suited do surveys. *If you want to do a poll about an event that spans over several days (with no options on starting hour), Standard Poll is also better suited.*
 
-Once you choose which type off poll you prefer, the first step in making a poll is common to both, in the first page you need to fill:
+Once you choose which type of poll you prefer, the first step in making a poll is common to both, in the first page you need to fill:
 
 * Your name (which will be publicly shown as the creator of the poll, choose whatever name you like)
 * Poll title

pages/08.Forum/01.basic-usage/docs.en.md

@@ -109,13 +109,13 @@ File, pictures, and videos will be presented on the left side of the screen (whe
 To move them just cut the line and paste it where you want it. Also in the case of pictures you can adjust their size by changing the values for "height" and "width" in the line.
 
 ## Adding tags to your topic
-Adding a tag makes it easier for people looking for topics or threads about a certain subject. Adding them is supper easy.
+Adding a tag makes it easier for people looking for topics or threads about a certain subject. Adding them is super easy.
 
 ![](en/forum_basics7.gif)
 
 Once your done with composing your topic just press "Create Topic" ![](en/forum_basics14.png)
 
-# Howto mute or watch categories
+# How to mute or watch categories
 In Discourse it's possible for you regulate the stream of posts you receive via the forum board or via email. You can mute categories or just a sub-category you are not interested or set categories to watch which will guarantee you will always receive notifications and emails of every post in a category or sub-category you are interested in.
 
 If you just mute a category you will be muting all sub-categories, unless you select a specific sub-category to watch. If you mute a category or sub-category you will still be able to access it in the message board, if you want to check it from time to time. You simply just don't receive any emails or notifications about it.

pages/08.Forum/02.mailinglist/docs.en.md

@@ -17,7 +17,7 @@ Disroot, mainly hosts private forum groups. If you are interested in one, drop u
 ----------
 # How mailinglist works in Discourse
 
-Discourse, the software used by Disroot, is a Forum software with malinglist functionalities. It has what we for this tutorial call **Groups**. And those Groups can have or not **Categories** in them (think of them as subjects or main topics).
+Discourse, the software used by Disroot, is a Forum software with mailinglist functionalities. It has what we for this tutorial call **Groups**. And those Groups can have or not **Categories** in them (think of them as subjects or main topics).
 As an example, the Disroot Group has several Categories dedicated to different subjects to organize discussions and exchange messages between users:
 
 ![](en/forum_ml1.png)

pages/09.Lufi/docs.en.md

@@ -25,7 +25,7 @@ In this tutorial we'll show you how to use it. You can access Uploads/Lufi at [u
 
 Notes:
 
-- Lufi is not a cloud service (files are only stored online for a certain time, after that they are deleted). For cloud services you have your [cloud](http://https//:cloud.disroot.org) provided by disroot.
+- Lufi is not a cloud service (files are only stored online for a certain time, after that they are deleted). For cloud services you have your [cloud](https//:cloud.disroot.org) provided by disroot.
 - It's different from PrivateBin. Bin can only share text, while Lufi can be used to share and download any type of file.
 
 ----------
@@ -95,7 +95,7 @@ You can also check this information any time you want by pressing the ![](en/luf
 
 ----------
 
-#How to upload and download a file<a name="upadndown"></a>
+# How to upload and download
 
 To upload a file just choose the options you want (if delete after download or not, and how many days it stays online) and "click to open the file browser" in the centre of the screen, and navigate to your file and select it, or just drag your file to the centre of the screen.
 
@@ -114,7 +114,7 @@ To download the file just use the link in the browser:
 ----------
 
 
-#How to share a file<a name="spampeople"></a>
+# How to share a file
 
 Well this is also very simple, you can either:
 
@@ -136,7 +136,7 @@ In this case disroot is a privacy conscious provider, but as a matter of princip
 
 ----------
 
-#How manage/delete your uploads<a name="links"></a>
+# How manage/delete your uploads
 
 You can manage your uploads by pressing the button ![](en/lufi07.png?resize=60,40) in the main panel.
 

pages/10.Contribute/how-to-use-git/docs.en.md

@@ -12,7 +12,7 @@ This article will try to explain the basics of using git to contribute to transl
 In order to follow all the changes and work with multiple people at the same time, we have chosen to use **git** as our version control system. Git is very popular tool among developers and system administrators but it's features can be easily applicable everywhere where history of changes and ability to submit content and collaborate in a group is required.
 
 
-In this tutorial we will not cover all the aspects of using git. It's very complex and powerfull tool with tons of in-depth tutorials and books written about it. What we are aiming at is providing as short and easy way to contribute to tutorials and translations.
+In this tutorial we will not cover all the aspects of using git. It's very complex and powerfull tool with tons of in-depth tutorials and books written about it. What we are aiming at is providing a short and easy way to contribute to tutorials and translations.
 
 # How to Create account on git instance
 First of you need an account on the git instance used by disroot.org. Unfortunately git is not yet a federated service so you need to have a account. Thanks to our friends at **FOSS Community India** we host all our work on their gitlab instance.
@@ -22,7 +22,7 @@ To create an account just go over to https://git.fosscommunity.in and register.
 Since all the modifications will happen on your local machine, you need to [install git](https://gist.github.com/derhuerst/1b15ff4652a867391f03) to be able to send your changes as well as sync changes of others. Depending on your platform the ways to install git may vary so check the link above or refer to your platform specific documentation.
 
 # Installing Atom editor
-If you haven't yet, it's time to install [Atom](https://atom.io). Atom is a feature rich text editor with special git integration. If your Operating system is not automatically detected or listed when going to [Atoms](https://atom.io) website, check [Other platfroms](https://github.com/atom/atom/releases/latest). For all Arch users, you can simply install it using `pacman -S atom` or other package manager of your choice.
+If you haven't yet, it's time to install [Atom](https://atom.io). Atom is a feature rich text editor with special git integration. If your Operating system is not automatically detected or listed when going to [Atoms](https://atom.io) website, check [Other platforms](https://github.com/atom/atom/releases/latest). For all Arch users, you can simply install it using `pacman -S atom` or other package manager of your choice.
 
 # Clonning repository
 Git is created with collaboration in it's core. First thing we need to do is get a copy of all files within the project (git repository) onto your local harddrive. All modifications are done on your local machine (you work offline). Only when you decide, the changes (new tutorial, translation) are finished you can decide to sent/sync (push) them back to the repository on the server.
@@ -53,7 +53,7 @@ To save the file changes use the *File* menu or *Ctrl+s* shortcut.
 
 # Git Branches
 Branches are basically your own private workspaces. Each git project has it's own **master** branch. Master branch is the main, *production* copy of the project. This branch is automatically synced with the website, so any change made to that branch are instantly visible on the website. That is also why adding any changes to the **master** branch is restricted only to the owners of the project.
-I order for you to start working is, create your own branch. This will basically make a clone of the **master** branch.
+In order for you to start working is, create your own branch. This will basically make a clone of the **master** branch.
 
 ![](en/atom-branch1.gif)
 
@@ -85,7 +85,7 @@ Once you think your work is finished and ready to be published on the website, i
 - This will open Merge request form.
 - Add title
 - Add descripton
-- make sure **source branch** is the one you want to merge form (one you worked on)
+- make sure **source branch** is the one you want to merge from (one you worked on)
 - make sure **target branch** is the one you want to merge to (usually master branch)
 
 ![](en/git-merge_request.gif)
@@ -93,7 +93,7 @@ Once you think your work is finished and ready to be published on the website, i
 Once you created merge request, it will be reviewed by Disroot admins. Admins can then aprove your commit which means it will be merged with the master branch and therefor visible on the website or request you to correct something. Once all the corrections are made and Disroot *"overlords"* are satified, your merge request will be pulled to the master.
 
 # Pulling changes from the server
-If you want to keep the local **master** branch and your local branched up to date, you need to pull changes from the server. Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called "CHANGELOG" where we note all significant changes to Howtos.
+If you want to keep the local **master** branch and your local branch up to date, you need to pull changes from the server. Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called "CHANGELOG" where we note all significant changes to Howtos.
 Pulling should be done on regular basis (specially before you start working on new branch).
 
  - Open push / pull popup window