diff --git a/ALL_README.md b/ALL_README.md
new file mode 100644
index 0000000..d6e8f9c
--- /dev/null
+++ b/ALL_README.md
@@ -0,0 +1,4 @@
+# All available README files by language
+
+- [Read the README in English](README.md)
+- [Lire le README en français](README_fr.md)
diff --git a/README.md b/README.md
index 10a5406..ab3b0a2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
+N.B.: This README was automatically generated by <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
 It shall NOT be edited by hand.
 -->
 
@@ -9,10 +9,10 @@ It shall NOT be edited by hand.
 
 [![Install Fluffychat with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluffychat)
 
-*[Lire ce readme en français.](./README_fr.md)*
+*[Read this README is other languages.](./ALL_README.md)*
 
-> *This package allows you to install Fluffychat quickly and simply on a YunoHost server.
-If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+> *This package allows you to install Fluffychat quickly and simply on a YunoHost server.*  
+> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
 
 ## Overview
 
@@ -22,7 +22,7 @@ The goal of the app is to create an easy to use instant messenger which is open
 
 **Shipped version:** 1.18.0~ynh2
 
-**Demo:** https://fluffychat.im/web
+**Demo:** <https://fluffychat.im/web>
 
 ## Screenshots
 
@@ -30,22 +30,22 @@ The goal of the app is to create an easy to use instant messenger which is open
 
 ## Documentation and resources
 
-* Official app website: <https://fluffychat.im/>
-* Official user documentation: <https://github.com/krille-chan/fluffychat/wiki#-user-guides>
-* Upstream app code repository: <https://github.com/krille-chan/fluffychat>
-* YunoHost Store: <https://apps.yunohost.org/app/fluffychat>
-* Report a bug: <https://github.com/YunoHost-Apps/fluffychat_ynh/issues>
+- Official app website: <https://fluffychat.im/>
+- Official user documentation: <https://github.com/krille-chan/fluffychat/wiki#-user-guides>
+- Upstream app code repository: <https://github.com/krille-chan/fluffychat>
+- YunoHost Store: <https://apps.yunohost.org/app/fluffychat>
+- Report a bug: <https://github.com/YunoHost-Apps/fluffychat_ynh/issues>
 
 ## Developer info
 
-Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing).
+Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing).
 
-To try the testing branch, please proceed like that.
+To try the `testing` branch, please proceed like that:
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
\ No newline at end of file
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
diff --git a/README_fr.md b/README_fr.md
index a552de0..6afc21b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -1,6 +1,6 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
-It shall NOT be edited by hand.
+Nota bene : ce README est automatiquement généré par <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Il NE doit PAS être modifié à la main.
 -->
 
 # Fluffychat pour YunoHost
@@ -9,10 +9,10 @@ It shall NOT be edited by hand.
 
 [![Installer Fluffychat avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=fluffychat)
 
-*[Read this readme in english.](./README.md)*
+*[Lire le README dans d'autres langues.](./ALL_README.md)*
 
-> *Ce package vous permet d’installer Fluffychat rapidement et simplement sur un serveur YunoHost.
-Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
+> *Ce package vous permet d’installer Fluffychat rapidement et simplement sur un serveur YunoHost.*  
+> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*
 
 ## Vue d’ensemble
 
@@ -20,9 +20,9 @@ FluffyChat est un client [[matrix](https://matrix.org)] open-source, à but non
 Le but de cette app est de créer un client de messagerie instantannée facile d'utilisation, open-source et accessible pour tout le monde.
 
 
-**Version incluse :** 1.18.0~ynh2
+**Version incluse :** 1.18.0~ynh2
 
-**Démo :** https://fluffychat.im/web
+**Démo :** <https://fluffychat.im/web>
 
 ## Captures d’écran
 
@@ -30,22 +30,22 @@ Le but de cette app est de créer un client de messagerie instantannée facile d
 
 ## Documentations et ressources
 
-* Site officiel de l’app : <https://fluffychat.im/>
-* Documentation officielle utilisateur : <https://github.com/krille-chan/fluffychat/wiki#-user-guides>
-* Dépôt de code officiel de l’app : <https://github.com/krille-chan/fluffychat>
-* YunoHost Store: <https://apps.yunohost.org/app/fluffychat>
-* Signaler un bug : <https://github.com/YunoHost-Apps/fluffychat_ynh/issues>
+- Site officiel de l’app : <https://fluffychat.im/>
+- Documentation officielle utilisateur : <https://github.com/krille-chan/fluffychat/wiki#-user-guides>
+- Dépôt de code officiel de l’app : <https://github.com/krille-chan/fluffychat>
+- YunoHost Store : <https://apps.yunohost.org/app/fluffychat>
+- Signaler un bug : <https://github.com/YunoHost-Apps/fluffychat_ynh/issues>
 
 ## Informations pour les développeurs
 
-Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing).
+Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing).
 
-Pour essayer la branche testing, procédez comme suit.
+Pour essayer la branche `testing`, procédez comme suit :
 
-``` bash
+```bash
 sudo yunohost app install https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade fluffychat -u https://github.com/YunoHost-Apps/fluffychat_ynh/tree/testing --debug
 ```
 
-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
\ No newline at end of file
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
diff --git a/manifest.toml b/manifest.toml
index d2651b7..a1be725 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -47,7 +47,9 @@ ram.runtime = "50M"
 
     [install.default_matrix_server]
     ask.en = "Default Matrix server"
+    ask.fr = "Serveur Matrix par défaut"
     help.en = "Must be a domain name or a sub-domain. Must not contain a path."
+    help.fr = "Doit être un nom de domaine ou un sous-domaine. Ne doit pas contenir de chemin d'accès."
     type = "url"
     default = "https://matrix.org"