From 55536d83aa34352700016c1e25445b0863a6141d Mon Sep 17 00:00:00 2001
From: Plumf <plumf@open-plug.eu>
Date: Fri, 3 Apr 2020 13:15:29 +0200
Subject: [PATCH] Add bitwarden documentation + Correction wallabag
 documentation

---
 app_bitwarden_en.md       |   2 ++
 app_bitwarden_fr.md       |  44 ++++++++++++++++++++++++++++++++++++++
 app_wallabag2.md          |  33 ----------------------------
 app_wallabag2_en.md       |  30 ++++++++++++++++++++++++++
 app_wallabag2_fr.md       |   4 +++-
 images/bitwarden_logo.png | Bin 0 -> 4087 bytes
 6 files changed, 79 insertions(+), 34 deletions(-)
 create mode 100644 app_bitwarden_en.md
 create mode 100644 app_bitwarden_fr.md
 delete mode 100644 app_wallabag2.md
 create mode 100644 app_wallabag2_en.md
 create mode 100644 images/bitwarden_logo.png

diff --git a/app_bitwarden_en.md b/app_bitwarden_en.md
new file mode 100644
index 00000000..2c7636df
--- /dev/null
+++ b/app_bitwarden_en.md
@@ -0,0 +1,2 @@
+# <img src="/images/bitwarden_logo.png" width="80px" alt="Bitwarden's logo"> Bitwarden
+Unfortunately, this page only exists [in french here](app_bitwarden_fr) for now.
diff --git a/app_bitwarden_fr.md b/app_bitwarden_fr.md
new file mode 100644
index 00000000..f55ba64b
--- /dev/null
+++ b/app_bitwarden_fr.md
@@ -0,0 +1,44 @@
+# <img src="https://yunohost.org/images/bitwarden_logo.png" width="80px" alt="logo de Bitwarden"> Bitwarden
+
+[![Install Bitwarden with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bitwarden) [![Integration level](https://dash.yunohost.org/integration/bitwarden.svg)](https://dash.yunohost.org/appci/app/bitwarden)
+
+- [Limitations avec Yunohost](#limitations-avec-yunohost)
+- [Fonctionnalités](fonctionnalite)
+- [Mettre à niveau depuis la V1.x](#mettre-a-niveau-depuis-la-version-1.x)
+- [Applications clientes](#applications-clients)
+- [Liens utiles](#liens-utiles)
+
+Bitwarden est un gestionnaire de mots de passe freemium et open source sous licence AGPL, qui permet de générer et de conserver des mots de passe de manière sécurisée. Ces éléments sont protégés par un seul et unique mot de passe appelé « mot de passe maître ». Il est créé en 2016 par Kyle Spearrin, un architecte logiciel.
+
+Le logiciel est disponible sur la plupart des systèmes d'exploitation (Linux, Windows, macOS, iOS, Android ainsi qu'en ligne de commande), et comme module d'extension pour navigateur web. Il est également possible de consulter ses mot de passe depuis un site web.[¹]
+
+## Fonctionnalités
+
+En plus des fonctionnalités principales de Wallabag, ce paquet propose également:
+
+ * Une intégration avec le système de gestion des utilisateurs et le SSO de Yunohost - e.g. un bouton de déconnexion
+ * De permettre à un utilisateur d'être administrateur (réglage lors de l'installation)
+ * Un import asynchrone utilisant Redis (à activer dans les *Paramètres Internes*). L'import via RabbitMQ n'est pas (encore ?) supporté.
+
+
+## Mettre à niveau depuis la version 1.x
+
+ La mise à niveau depuis le paquet Yunohost de [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh) demande une opération manuelle, c'est pourquoi un nouveau paquet est fournit.
+ Pour le processus de migration, merci de vous référer à [la documentation officiel de Wallabag](https://doc.wallabag.org/fr/user/import/wallabagv1.html).
+
+## Applications clientes
+
+| Nom de l'applications | Plateforme | Multi-comptes | Lien |
+|-----------------------|------------|---------------|------|
+| Bitwarden | Linux / Mac / Windows  | Oui | [bitwarden.com/download](https://bitwarden.com/#download)
+
+## Liens utiles
+
+ + Site web : [bitwarden.com](https://bitwarden.com/)
+ + Documentation officielle : [help.bitwarden.com](https://help.bitwarden.com/)
+ + Dépôt logiciel de l'application : [github.com - YunoHost-Apps/bitwarden](https://github.com/YunoHost-Apps/bitwarden_ynh)
+ + Remonter un bug ou une amélioration en créant un ticket (issue) : [github.com -YunoHost-Apps/bitwarden/issues](https://github.com/YunoHost-Apps/bitwarden_ynh/issues)
+
+ ------
+
+ [¹]: [wikipedia.org - Bitwarden](https://fr.wikipedia.org/wiki/Bitwarden)
diff --git a/app_wallabag2.md b/app_wallabag2.md
deleted file mode 100644
index 823bcd06..00000000
--- a/app_wallabag2.md
+++ /dev/null
@@ -1,33 +0,0 @@
-## <img src="https://yunohost.org/images/Logo-wallabag-svg.svg">
-
-[Wallabag](https://www.wallabag.org/) is a self hostable Read-It-Later application allowing
-you to not miss any content anymore. Click, save, read it when you can.
-It extracts content so that you can read it when you have time.
-
-[![Install Wallabag v2 with 
-YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
-
-It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo)
-
-### Features
-
-In addition to Wallabag core features, the following are made available with
-this package:
-
- * Integrate with YunoHost users and SSO - i.e. logout button
- * Allow one user to be the administrator (set at the installation)
- * Asynchronous import using Redis (need to be enabled in the *Internal Settings*). RabbitMQ import not supported (yet ?)
-
-### Links
-
- * Report a bug: https://github.com/YunoHost-Apps/wallabag2_ynh/issues
- * Wallabag website: https://www.wallabag.org/
- * Wallabag documentation: https://doc.wallabag.org/ (fr/en/it/de)
- * [Video demo](https://vimeo.com/video/167435064)
- 
-----
-
-### Upgrade from v1.x
-
-No automatic upgrade process is available. You need a manual (but simple) migration from [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh).
-Please take a look at the [official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
diff --git a/app_wallabag2_en.md b/app_wallabag2_en.md
new file mode 100644
index 00000000..8d081ab3
--- /dev/null
+++ b/app_wallabag2_en.md
@@ -0,0 +1,30 @@
+# <img src="https://yunohost.org/images/wallabag_logo.svg" width="80px" alt="logo de Wallabag"> Wallabag
+
+[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2) [![Integration level](https://dash.yunohost.org/integration/wallabag2.svg)](https://dash.yunohost.org/appci/app/wallabag2)
+
+Wallabag is a self hostable Read-It-Later application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
+
+It provides a web interface, browser (Firefox / Chrome / Opera) add-ons, mobile apps (Android / iOS / Windows Phone) and even on e-reader (PocketBook / Kobo)
+
+### Features
+
+In addition to Wallabag core features, the following are made available with
+this package:
+
+ * Integrate with YunoHost users and SSO - i.e. logout button
+ * Allow one user to be the administrator (set at the installation)
+ * Asynchronous import using Redis (need to be enabled in the *Internal Settings*). RabbitMQ import not supported (yet ?)
+
+## Useful links
+
+ + Website : [www.wallabag.org](https://www.wallabag.org/fr)
+ + Official documentation : [doc.wallabag.org](https://doc.wallabag.org/fr/)
+ + Application software repository : [github.com - YunoHost-Apps/wallabag2](https://github.com/YunoHost-Apps/wallabag2_ynh)
+ + Fix a bug or an improvement by creating a ticket (issue) : [github.com -YunoHost-Apps/wallabag2/issues](https://github.com/YunoHost-Apps/wallabag2_ynh/issues)
+
+----
+
+### Upgrade from v1.x
+
+No automatic upgrade process is available. You need a manual (but simple) migration from [Wallabag v1](https://github.com/YunoHost-Apps/wallabag_ynh).
+Please take a look at the [official documentation](https://doc.wallabag.org/en/user/import/wallabagv1.html).
diff --git a/app_wallabag2_fr.md b/app_wallabag2_fr.md
index 84af89b5..c25d0a88 100644
--- a/app_wallabag2_fr.md
+++ b/app_wallabag2_fr.md
@@ -26,9 +26,11 @@ En plus des fonctionnalités principales de Wallabag, ce paquet propose égaleme
 
 ## Applications clientes
 
+| Nom de l'applications | Plateforme | Multi-comptes | Autre réseaux supportés | Play Store | F-Droid | Apple Store |
+|-----------------------|------------|---------------|-------------------------|------------|---------|-------------|
 ## Liens utiles
 
-   + Site web : [www.wallabag.org](https://www.wallabag.org/fr)
+ + Site web : [www.wallabag.org](https://www.wallabag.org/fr)
  + Documentation officielle : [doc.wallabag.org](https://doc.wallabag.org/fr/)
  + Dépôt logiciel de l'application : [github.com - YunoHost-Apps/wallabag2](https://github.com/YunoHost-Apps/wallabag2_ynh)
  + Remonter un bug ou une amélioration en créant un ticket (issue) : [github.com -YunoHost-Apps/wallabag2/issues](https://github.com/YunoHost-Apps/wallabag2_ynh/issues)
diff --git a/images/bitwarden_logo.png b/images/bitwarden_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e4c84ba1f3440006e62101181597b7d4f2be42
GIT binary patch
literal 4087
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
Zc0+^N{CiaU^A<^Cq<>fM{Vk`M{{h3}=k@>q

literal 0
HcmV?d00001