diff --git a/pages/02.tutorials/01.User/01.Account/docsparent.en.md b/pages/02.tutorials/01.User/01.Account/docsparent.en.md
index 8ff9c044..df92490a 100644
--- a/pages/02.tutorials/01.User/01.Account/docsparent.en.md
+++ b/pages/02.tutorials/01.User/01.Account/docsparent.en.md
@@ -4,7 +4,7 @@ published: true
indexed: true
visible: true
updated:
- last_modified: "July 2019"
+ last_modified: "June 2020"
taxonomy:
category:
- docs
diff --git a/pages/02.tutorials/01.User/01.Account/thumb.png b/pages/02.tutorials/01.User/01.Account/thumb.png
index ca0ce989..c154768d 100644
Binary files a/pages/02.tutorials/01.User/01.Account/thumb.png and b/pages/02.tutorials/01.User/01.Account/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.en.md
deleted file mode 100755
index b2e7bb51..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.en.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: 'Nextcloud: Exporting Bookmarks'
-published: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Nextcloud
- app_version: 15
-taxonomy:
- category:
- - docs
- tags:
- - user
- - cloud
- - bookmarks
- - gdpr
-visible: true
-page-toc:
- active: false
----
-
-Exporting your bookmark data stored on the cloud is very easy with **Disroot**.
-
-1. Login to the [cloud](https://cloud.disroot.org)
-
-2. Select Bookmark app
-
-
-
-3. Select Settings (on the bottom of the right sidebar) and press **"Export"** button
-
-
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/export.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/export.gif
deleted file mode 100644
index a98661ef..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/export.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/select_app.gif
deleted file mode 100644
index 8d04b9b4..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/pt/select_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.en.md
deleted file mode 100755
index 136c883a..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.en.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-title: Nextcloud: Exporting Calendars
-published: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Nextcloud
- app_version: 15
-taxonomy:
- category:
- - docs
- tags:
- - user
- - cloud
-visible: true
-page-toc:
- active: false
----
-
-Exporting calendars is possible out of the box. Simply:
-
-1. Login to the [cloud](https://cloud.disroot.org)
-
-2. Select Calendar app
-
-
-
-3. Export any on your calendars or calendars you are subscribed to.
-Select *"three dot"* menu option next to calendar you want to export and hit *"Export"* option. Exported calendar is saved in .ics format.
-
-
-
-Repeat the process for all other calendars you want to export.
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/export-calendar.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/export-calendar.gif
deleted file mode 100644
index 372370e5..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/export-calendar.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/select_app.gif
deleted file mode 100644
index fc9e53db..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/en/select_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.en.md
deleted file mode 100755
index 93a83d87..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.en.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: "Nextcloud: Exporting Contacts"
-published: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Nextcloud
- app_version: 15
-taxonomy:
- category:
- - docs
- tags:
- - user
- - cloud
-visible: true
-page-toc:
- active: false
----
-
-Contacts can be exported at any time in a very simple way.
-
-1. Login to your cloud account at [https://cloud.disroot.org](https://cloud.disroot.org)
-
-2. Select "*Contacts*" App.
-
-
-
-3. Hit the download button next to the addressbook you want to export. Contacts are saved in .vcf format.
-
-
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/export_data.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/export_data.gif
deleted file mode 100644
index 5f73c5fe..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/export_data.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/select_app.gif
deleted file mode 100644
index 56ebaec7..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/en/select_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/en/files_app.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/en/files_app.gif
deleted file mode 100644
index 6c1dd6aa..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/en/files_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.en.md
deleted file mode 100755
index 13114c3d..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.en.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: Nextcloud: Exporting News data
-published: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Nextcloud
- app_version: 15
-taxonomy:
- category:
- - docs
- tags:
- - user
- - cloud
- - news
- - gdpr
-visible: true
-page-toc:
- active: false
----
-
-Exporting your news feeds and your subscriptions is as easy as in case of any **Nextcloud** app.
-
-1. Login to [cloud](https://cloud.disroot.org)
-
-2. Select **News** app
-
-
-
-3. Select Settings on the bottom of the left side-bar.
-
-5. Depending on your needs you can either decided to export:
- - Your subscriptions (OPML) - This is specially useful if you want to change your News feed (RSS reader) provider or if you simply would like to have a backup of current news site list.
- - Unread/Starred articles - If you want to export the article content themselves either for offline use, archive purpose or migration. Note read articles get removed in regular intervals.
-
-
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/export.gif
deleted file mode 100644
index 05687bc3..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/export.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/select_app.gif
deleted file mode 100644
index e3bcaa25..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/en/select_app.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/thumb.png b/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/thumb.png
deleted file mode 100644
index 037172ba..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/thumb.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.roundcube/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/docs.en.md
new file mode 100644
index 00000000..924cdb71
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/docs.en.md
@@ -0,0 +1,34 @@
+---
+title: 'Email: Export'
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Roundcube
+ app_version:
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - email
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
+
+# Export your emails
+
+Exporting your emails from **Disroot Webmail** is pretty easy.
+
+**Roundcube** saves the messages as singles **eml** files. **EML** is an email file format which is supported by most modern email clients.
+
+First, go to the folder where the emails you want to export/save are. You can download one, several messages or the whole folder.
+
+- Select the messages through the **Select** action
+- In the preview pane at the top bar, select **More** and then **Download**
+- Choose the format in which you prefer to download the data (individual messages can be downloaded in .eml format and folders or sets of messages can be downloaded in .zip format)
+- Choose where to save the file.
+
+
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.roundcube/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/en/export.gif
new file mode 100644
index 00000000..81cdb092
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.roundcube/thumb.png b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/thumb.png
new file mode 100644
index 00000000..988cf442
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/01.roundcube/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/thumb.png
deleted file mode 100644
index 68f61c1b..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/thumb.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.en.md
new file mode 100755
index 00000000..579646e3
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.en.md
@@ -0,0 +1,33 @@
+---
+title: 'Nextcloud: Exporting Bookmarks'
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Nextcloud
+ app_version: 18
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - cloud
+ - bookmarks
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
+
+Exporting your bookmark data stored on the **Disroot** cloud is very easy.
+
+ - Login to the [cloud](https://cloud.disroot.org).
+ - Select **Bookmark** app.
+
+ 
+
+ - Select **Settings** (on the bottom of the right sidebar) and press the **Export** button.
+
+ 
+
+ - Select where to save the file.
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/export.gif
new file mode 100644
index 00000000..64e40c53
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/select.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/select.gif
new file mode 100644
index 00000000..357ed150
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/en/select.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/.gitkeep b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/.gitkeep
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/.gitkeep
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/.gitkeep
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/es/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/es/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/fr/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/fr/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/fr/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/fr/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/fr/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/fr/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/fr/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/fr/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/it/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/it/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/it/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/it/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/it/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/it/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/it/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/it/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/pt/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/en/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/pt/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/en/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/pt/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/en/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/pt/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/thumb.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/01.Bookmarks/thumb.png
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/01.Bookmarks/thumb.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.en.md
new file mode 100755
index 00000000..d3516489
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.en.md
@@ -0,0 +1,31 @@
+---
+title: 'Nextcloud: Exporting Calendars'
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Nextcloud
+ app_version: 18
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - cloud
+visible: true
+page-toc:
+ active: false
+---
+
+Exporting calendars is quite simple:
+
+ - Login to the [cloud](https://cloud.disroot.org)
+ - Select Calendar app
+
+ 
+
+ - To export any of your calendars or the calendars you are subscribed to, select the *"three dot"* menu option next to the calendar and hit *"Export"* option. Exported calendar is saved in .ics format.
+
+ 
+
+ - Repeat the process for all other calendars you want to export.
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/export.gif
new file mode 100644
index 00000000..979ae75b
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/select.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/select.gif
new file mode 100644
index 00000000..706472e4
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/en/select.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/.gitkeep b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/.gitkeep
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/.gitkeep
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/.gitkeep
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/export-calendar.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/export-calendar.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/export-calendar.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/export-calendar.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/es/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/es/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/fr/export-calendar.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/fr/export-calendar.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/fr/export-calendar.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/fr/export-calendar.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/fr/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/fr/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/fr/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/fr/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/it/export-calendar.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/it/export-calendar.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/it/export-calendar.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/it/export-calendar.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/it/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/it/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/it/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/it/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/pt/export_calendar.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/pt/export_calendar.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/pt/export_calendar.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/pt/export_calendar.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/pt/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/pt/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/pt/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/pt/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/thumb.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/02.Calendar/thumb.png
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/02.Calendar/thumb.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.en.md
new file mode 100755
index 00000000..2cdc2a41
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.en.md
@@ -0,0 +1,30 @@
+---
+title: "Nextcloud: Exporting Contacts"
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Nextcloud
+ app_version: 18
+taxonomy:
+ category:
+ - docs
+ tags:
+ - gdpr
+ - user
+ - cloud
+visible: true
+page-toc:
+ active: false
+---
+
+Contacts can be exported at any time in a very simple way.
+
+ - Login to your cloud account at [https://cloud.disroot.org](https://cloud.disroot.org)
+ - Select "*Contacts*" app.
+
+ 
+
+ - Hit the download button next to the addressbook you want to export. Contacts are saved in .vcf format.
+
+ 
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/export.gif
new file mode 100644
index 00000000..e7ece434
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/select.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/select.gif
new file mode 100644
index 00000000..96ebf0ac
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/en/select.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/.gitkeep b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/.gitkeep
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/.gitkeep
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/.gitkeep
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/export_data.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/export_data.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/export_data.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/export_data.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/es/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/es/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/fr/export_data.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/fr/export_data.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/fr/export_data.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/fr/export_data.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/fr/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/fr/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/fr/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/fr/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/it/export_data.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/it/export_data.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/it/export_data.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/it/export_data.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/it/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/it/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/it/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/it/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/pt/export_data.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/pt/export_data.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/pt/export_data.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/pt/export_data.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/pt/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/pt/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/pt/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/pt/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/thumb.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/03.Contacts/thumb.png
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/03.Contacts/thumb.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.en.md
similarity index 60%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.en.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.en.md
index acc7904a..1674a8b8 100644
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.en.md
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.en.md
@@ -3,7 +3,7 @@ title: 'Export data: Nextcloud Files & Notes'
published: true
indexed: true
updated:
- last_modified: "May 2020"
+ last_modified: "June 2020"
app: Nextcloud
app_version: 18
taxonomy:
@@ -22,12 +22,9 @@ page-toc:
You can download your files as easy as in case of any **Nextcloud** app.
-1. Login to your [cloud](https://cloud.disroot.org)
+ - Login to your [cloud](https://cloud.disroot.org)
+ - Select **Files** app
+ - Select all files by clicking on the checkbox
+ - Then click on the **Actions** menu and select *Download*
-2. Select **Files** app
-
-3. Select all files by clicking on the checkbox
-
-4. Then click on the **Actions** menu and select *Download*
-
-
+
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/en/export_files.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/en/export_files.gif
new file mode 100644
index 00000000..feef1fb8
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/en/export_files.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/es/files_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/es/files_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/es/files_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/es/files_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/fr/files_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/fr/files_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/fr/files_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/fr/files_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/fr/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/fr/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/fr/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/fr/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/it/files_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/it/files_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/it/files_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/it/files_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/pt/files_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/pt/files_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/pt/files_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/pt/files_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/thumb.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/thumb.png
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/04.Files/thumb.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md
new file mode 100755
index 00000000..5d26f8b7
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.en.md
@@ -0,0 +1,34 @@
+---
+title: 'Nextcloud: Exporting News'
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Nextcloud
+ app_version: 18
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - cloud
+ - news
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
+
+Exporting your news feeds and your subscriptions is as easy as in case of any **Nextcloud** app.
+
+ - Login to the [cloud](https://cloud.disroot.org)
+ - Select the **News** app
+
+ 
+
+ - Select Settings on the bottom of the left side-bar.
+ - Depending on your needs you can either decided to export:
+ - Your subscriptions (OPML) - This is specially useful if you want to change your News feed (RSS reader) provider or if you simply would like to have a backup of current news site list.
+ - Unread/Starred articles - If you want to export the article content themselves either for offline use, archive purpose or migration. Note read articles get removed in regular intervals.
+
+ 
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif
new file mode 100644
index 00000000..caa5c35a
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif
new file mode 100644
index 00000000..50e80ca5
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/en/select.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/es/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/es/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/es/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/es/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/es/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/fr/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/fr/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/fr/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/fr/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/fr/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/fr/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/fr/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/fr/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/it/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/it/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/it/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/it/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/it/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/it/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/it/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/it/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/pt/export.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/pt/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/pt/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/pt/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/pt/select_app.gif b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/pt/select_app.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/pt/select_app.gif
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/pt/select_app.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/thumb.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/05.News/thumb.png
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/05.News/thumb.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.en.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.en.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.en.md
index 85df4b3a..eb129a7b 100755
--- a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.en.md
+++ b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.en.md
@@ -14,8 +14,8 @@ page-toc:
---
## How-to export your...
- - [**Files and Notes**](files)
- - [**Contacts**](contacts)
- - [**Calendars**](calendar)
- - [**News**](news)
- [**Bookmarks**](bookmarks)
+ - [**Calendars**](calendar)
+ - [**Contacts**](contacts)
+ - [**Files and Notes**](files)
+ - [**News**](news)
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/02.nextcloud/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/thumb.png b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/thumb.png
new file mode 100644
index 00000000..70085f97
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/02.nextcloud/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.en.md
deleted file mode 100755
index 8a7dc06d..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.en.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: "Discourse: Exporting your Forum posts"
-published: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Discourse
- app_version: 2.3
-taxonomy:
- category:
- - docs
- tags:
- - user
- - forum
- - discourse
- - gdpr
-visible: true
-page-toc:
- active: false
----
-
-**Discourse**, the software used by **Disroot** for **Forum**, allows you to export the text content off all your posts to a .csv file, (which is supported by most calc/spreadsheet software's, Libreoffice, Openoffice, Gnumeric, Excel).
-
-**To export your posts from Discourse:**
-- Press your Gravatar on the upper right corner of the screen
-
-- Press the button with your username
-
-- Press the button _"Download my posts"_
-
-- Press _"yes"_ when the pop-up window asks if you want to download your posts and then press _"ok"_
-
-**NOTE:** The data can only be downloaded once every 24h
-
-
-
-You will get a message from the system notifying you that the data is ready to be downloaded, and providing you a link to download the .csv file with a copy of your posts.
-If you have enabled notifications via email, you will also get an email with this information. Just press the link to download the file.
-
-The data is compressed as a gzip archive. If the archive does not extract itself when you open it, use the tools recommended here: http://www.gzip.org/#faq4
-
-The link will be available for 48h, after that it will expire and you will have to export your data again.
-
-Once you extract the file you can open it in your spreadsheet program.
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_01.gif b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_01.gif
deleted file mode 100644
index 666acc8c..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_01.gif and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.png b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.png
deleted file mode 100644
index dce70d5f..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_02.png b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_02.png
deleted file mode 100644
index bfcb4be5..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_02.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_03.png b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_03.png
deleted file mode 100644
index eee4d5df..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_03.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/thumb.png b/pages/02.tutorials/01.User/02.GDPR/03.Discourse/thumb.png
deleted file mode 100644
index 2ced1bc3..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/thumb.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.converse/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/03.converse/docs.en.md
new file mode 100644
index 00000000..f29796dd
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/03.converse/docs.en.md
@@ -0,0 +1,19 @@
+---
+title: "XMPP Chat"
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Converse
+ app_version:
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - chat
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.converse/thumb.png b/pages/02.tutorials/01.User/02.GDPR/03.converse/thumb.png
new file mode 100644
index 00000000..1ed98d3c
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/03.converse/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.en.md
deleted file mode 100755
index 6c69f063..00000000
--- a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.en.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: "Taiga: Project export"
-published: true
-visible: true
-indexed: true
-updated:
- last_modified: "July 2019"
- app: Taiga
- app_version: 4.2
-taxonomy:
- category:
- - docs
- tags:
- - user
- - taiga
- - gdpr
- visible: true
-page-toc:
- active: false
----
-
-Follow these steps to export your project's data from **Taiga**'s interface:
-
-1. Go to https://board.disroot.org and log in.
-2. select the project you want to export and go to the Admin's settings.
-
-
-
-3. Under the **Project** tab you will find the **Export** option. Click the  button to generate a .json file with all the project's information. You can use that as a backup or to start a new project based on it.
-
-
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export.png b/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export.png
deleted file mode 100644
index a7b76f77..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export_button.png b/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export_button.png
deleted file mode 100644
index b937a6e1..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/export_button.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/settings.png b/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/settings.png
deleted file mode 100644
index a2e429e6..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/en/settings.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/thumb.png b/pages/02.tutorials/01.User/02.GDPR/04.Taiga/thumb.png
deleted file mode 100644
index b7417535..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/thumb.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.en.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.en.md
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.en.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/data-download.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/data-download.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/data-download.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/data-download.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/request.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/request.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/request.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/request.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/settings.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/wait-request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/wait-request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/en/wait-request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/en/wait-request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/data-download.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/data-download.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/data-download.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/data-download.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/settings.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/wait-request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/wait-request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/es/wait-request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/es/wait-request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/data-download.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/data-download.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/data-download.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/data-download.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/request.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/request.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/request.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/request.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/settings.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/wait-request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/wait-request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/fr/wait-request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/fr/wait-request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/data-download.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/data-download.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/data-download.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/data-download.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/request.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/request.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/request.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/request.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/settings.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/wait-request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/wait-request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/it/wait-request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/it/wait-request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/data-download.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/data-download.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/data-download.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/data-download.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/request.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/request.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/request.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/request.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/settings.gif b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/wait-request.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/wait-request.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/02.Diaspora/pt/wait-request.png
rename to pages/02.tutorials/01.User/02.GDPR/04.diaspora/pt/wait-request.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.diaspora/thumb.png b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/thumb.png
new file mode 100644
index 00000000..5672b96d
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/04.diaspora/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/thumb.png b/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/thumb.png
deleted file mode 100644
index 167636df..00000000
Binary files a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/thumb.png and /dev/null differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.en.md
new file mode 100755
index 00000000..8978e668
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.en.md
@@ -0,0 +1,56 @@
+---
+title: "Discourse: Exporting your Forum posts"
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Discourse
+ app_version: 2.3
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - forum
+ - discourse
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
+**Discourse**, the forum software used by **Disroot**, allows you to export the text content of all your posts to a .csv file, (a simple text file which is supported by most calc/spreadsheet software).
+
+
+**To export your posts from Discourse:**
+- Login in the **Forum**
+- Press your user avatar on the upper right corner of the screen
+- Press the button with your username
+
+ 
+
+- Press the **Download All** button
+
+ 
+
+- A pop-up windows will appear asking if you want to download your posts and then press **OK**
+
+ 
+
+- The system will start processing your data and send you a notification when it is ready to download.
+
+ 
+
+ 
+
+- You will get a message from the system notifying you that the data is ready to be downloaded, and providing you a link to download the .csv file with a copy of your posts. If you have enabled notifications via email, you will also get an email with this information.
+
+- Press the link to download the file.
+
+ 
+
+- The link will be available for 48h, after that it will expire and you will have to export your data again.
+
+- Once you extract the file you can open it in your spreadsheet program.
+
+
+**NOTE**: The data can only be downloaded once every 24h
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_1.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_1.png
new file mode 100644
index 00000000..f71610e1
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_1.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_2.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_2.png
new file mode 100644
index 00000000..f0d7b0ff
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_2.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_3.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_3.png
new file mode 100644
index 00000000..c5390a27
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/download_3.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/export.gif
new file mode 100644
index 00000000..0ca96e78
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/login.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/login.gif
new file mode 100644
index 00000000..d1a6cc40
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/login.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification.png
new file mode 100644
index 00000000..b8064b73
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification_2.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification_2.png
new file mode 100644
index 00000000..ac676ffd
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/en/notification_2.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_01.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_01.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_01.gif
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_01.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_01.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_01.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_01.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_01.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_02.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_02.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_02.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_02.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_03.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_03.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/es/export_data_discourse_03.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/es/export_data_discourse_03.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/fr/export_data_discourse_01.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/fr/export_data_discourse_01.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/fr/export_data_discourse_01.gif
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/fr/export_data_discourse_01.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_01.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_01.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_01.gif
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_01.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_01.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_01.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_01.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_01.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_02.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_02.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_02.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_02.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_03.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_03.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/it/export_data_discourse_03.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/it/export_data_discourse_03.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.gif b/pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_01.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.gif
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_01.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_01.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_01.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_01.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_01.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_02.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_02.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_02.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_02.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_03.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_03.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/03.Discourse/en/export_data_discourse_03.png
rename to pages/02.tutorials/01.User/02.GDPR/05.discourse/pt/export_data_discourse_03.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.discourse/thumb.png b/pages/02.tutorials/01.User/02.GDPR/05.discourse/thumb.png
new file mode 100644
index 00000000..f738e3ee
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/05.discourse/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.en.md
new file mode 100755
index 00000000..6d647371
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.en.md
@@ -0,0 +1,28 @@
+---
+title: "Taiga: Project export"
+published: true
+visible: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Taiga
+ app_version: 5.0.8s
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - taiga
+ - gdpr
+ visible: true
+page-toc:
+ active: false
+---
+
+To export your project's data from **Taiga**, just follow these steps:
+
+- Go to https://board.disroot.org and log in.
+- Select the project you want to export and go to the Admin's settings.
+- Under the **Project** tab you will find the **Export** option. Click the **EXPORT** button to generate a .json file with all the project's information. You can use that as a backup or to start a new project based on it.
+
+
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/06.taiga/en/export.gif b/pages/02.tutorials/01.User/02.GDPR/06.taiga/en/export.gif
new file mode 100644
index 00000000..0e51a8f9
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/06.taiga/en/export.gif differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/.gitkeep b/pages/02.tutorials/01.User/02.GDPR/06.taiga/es/.gitkeep
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/.gitkeep
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/es/.gitkeep
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/export.gif b/pages/02.tutorials/01.User/02.GDPR/06.taiga/es/export.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/export.gif
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/es/export.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/export_button.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/es/export_button.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/export_button.png
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/es/export_button.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/settings.gif b/pages/02.tutorials/01.User/02.GDPR/06.taiga/es/settings.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/es/settings.gif
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/es/settings.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/export.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/it/export.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/export.png
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/it/export.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/export_button.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/it/export_button.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/export_button.png
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/it/export_button.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/settings.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/it/settings.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/it/settings.png
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/it/settings.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_button.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_button.png
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_button.png
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_button.png
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_taiga1.gif b/pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_taiga1.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_taiga1.gif
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_taiga1.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_taiga2.gif b/pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_taiga2.gif
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/04.Taiga/pt/export_taiga2.gif
rename to pages/02.tutorials/01.User/02.GDPR/06.taiga/pt/export_taiga2.gif
diff --git a/pages/02.tutorials/01.User/02.GDPR/06.taiga/thumb.png b/pages/02.tutorials/01.User/02.GDPR/06.taiga/thumb.png
new file mode 100644
index 00000000..fe1c0447
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/06.taiga/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/07.git/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/07.git/docs.en.md
new file mode 100644
index 00000000..43c22499
--- /dev/null
+++ b/pages/02.tutorials/01.User/02.GDPR/07.git/docs.en.md
@@ -0,0 +1,19 @@
+---
+title: "Git"
+published: true
+indexed: true
+updated:
+ last_modified: "June 2020"
+ app: Gitea
+ app_version:
+taxonomy:
+ category:
+ - docs
+ tags:
+ - user
+ - email
+ - gdpr
+visible: true
+page-toc:
+ active: false
+---
diff --git a/pages/02.tutorials/01.User/02.GDPR/07.git/thumb.png b/pages/02.tutorials/01.User/02.GDPR/07.git/thumb.png
new file mode 100644
index 00000000..10085007
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/07.git/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.en.md b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.en.md
similarity index 97%
rename from pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.en.md
rename to pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.en.md
index 479806bd..647d365f 100755
--- a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.en.md
+++ b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.en.md
@@ -4,9 +4,9 @@ published: true
visible: true
indexed: true
updated:
- last_modified: "July 2019"
+ last_modified: "June 2020"
app: Hubzilla
- app_version: 4.2
+ app_version: 4.6
taxonomy:
category:
- docs
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.es.md b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.es.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.es.md
rename to pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.es.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.fr.md b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.fr.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.fr.md
rename to pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.fr.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.it.md b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.it.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.it.md
rename to pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.it.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.pt.md b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.pt.md
similarity index 100%
rename from pages/02.tutorials/01.User/02.GDPR/05.Hubzilla/docs.pt.md
rename to pages/02.tutorials/01.User/02.GDPR/08.hubzilla/docs.pt.md
diff --git a/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/thumb.png b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/thumb.png
new file mode 100644
index 00000000..98edbe78
Binary files /dev/null and b/pages/02.tutorials/01.User/02.GDPR/08.hubzilla/thumb.png differ
diff --git a/pages/02.tutorials/01.User/02.GDPR/docsparent.en.md b/pages/02.tutorials/01.User/02.GDPR/docsparent.en.md
index ecfb0e23..979ce311 100755
--- a/pages/02.tutorials/01.User/02.GDPR/docsparent.en.md
+++ b/pages/02.tutorials/01.User/02.GDPR/docsparent.en.md
@@ -1,10 +1,10 @@
---
-title: Export Personal Data / GDPR Compliance
+title: 'Export Your Personal Data / GDPR Compliance'
visible: true
published: true
indexed: true
updated:
- last_modified: "July 2019"
+ last_modified: "June 2020"
taxonomy:
category:
- docs
@@ -17,20 +17,31 @@ page-toc:
active: false
---
-# How-to Self-export your personal data
-At **Disroot** pretty much all data collected is the one you provide when using services (we store your files because you choose to store files on our cloud). We have no interest in acquiring and collecting any extra data nor processing it to sell to advertisement companies or in any way use to monetize on it. Therefore most of the services provides you with a way to self export your data. This chapter includes tutorials that will help you get all the data stored on services provided by **Disroot** and connected to your account.
+# Your data is data is yours:
How to access and export your personal data
-## Contents
-- [Cloud (Nextcloud)](nextcloud)
+
+At **Disroot**, pretty much all data collected is the one you provide when using the services (*we store your files because you choose to store files on our cloud*).
+
+We have no interest in acquiring and collecting any extra data nor processing it to sell to advertisement companies or in any way use to monetize on it. Therefore most of the services provide you with a way to self export your data.
+
+This chapter includes tutorials that will help you get all the data stored on services provided by **Disroot** and connected to your account.
+
+----
+
+## Export your data from:
+- [01. Email (Roundcube)](roundcube)
+- [02. Cloud (Nextcloud)](nextcloud)
- [Files & Notes](nextcloud/files)
- [Contacts](nextcloud/contacts)
- [Calendars](nextcloud/calendar)
- [News](nextcloud/news)
- [Bookmarks](nextcloud/bookmarks)
-- [Diaspora*](diaspora)
-- [Forum (Discourse)](discourse)
-- [Board (Taiga)](taiga)
-- [Hubzilla](hubzilla)
+- [03. XMPP Chat (Converse)](converse)
+- [04. Diaspora*](diaspora)
+- [05. Forum (Discourse)](discourse)
+- [06. Board (Taiga)](taiga)
+- [07. Git (Gitea)](gitea)
+- [08. Hubzilla](hubzilla)
---
diff --git a/pages/02.tutorials/01.User/02.GDPR/thumb.png b/pages/02.tutorials/01.User/02.GDPR/thumb.png
index 6c3c6a17..c955b906 100644
Binary files a/pages/02.tutorials/01.User/02.GDPR/thumb.png and b/pages/02.tutorials/01.User/02.GDPR/thumb.png differ
diff --git a/pages/02.tutorials/01.User/03.DisApp/docs.en.md b/pages/02.tutorials/01.User/03.DisApp/docs.en.md
index e7333e61..3270be98 100644
--- a/pages/02.tutorials/01.User/03.DisApp/docs.en.md
+++ b/pages/02.tutorials/01.User/03.DisApp/docs.en.md
@@ -17,11 +17,18 @@ page-toc:
active: false
---
-# The Disroot's Community application
-
-**One App to rule them all**
+# **DisApp**: The Disroot's Community application
+
-Disrooter **Massimiliano** saw the potential of a **Disroot** app and decided to take the challenge with an unexpected approach. He developed the **Disroot "Swiss army knife"** app that helps and guides disrooters to recommended apps, tips and tutorials on how to set everything up. The app will pick the best (in our opinion) app for email, chat, etc, and for those services that don't have a dedicated app it will open them in the webview window. The app also provides directions to all community tutorials we've gathered over the years to help people use provided services.
+## **One App to rule them all**
-The app is available from the one and only truly Free/Libre Android store: [here](https://f-droid.org/en/packages/org.disroot.disrootapp/).
+----
+## Background
+Disrooter **Massimiliano** saw the potential of a **Disroot** app and decided to take the challenge with an unexpected approach. He developed the **Disroot "Swiss army knife"** app that helps and guides disrooters to recommended apps, tips and tutorials on how to set everything up.
+
+## What does it do?
+The app will pick the best (in our opinion) app for email, chat, etc, and for those services that don't have a dedicated app it will open them in the webview window. The app also provides directions to all community tutorials we've gathered over the years to help people use provided services.
+
+## Where can you get it?
+The app is available from the **F-Droid**'s store [here](https://f-droid.org/en/packages/org.disroot.disrootapp/).
diff --git a/pages/02.tutorials/01.User/03.DisApp/thumb.png b/pages/02.tutorials/01.User/03.DisApp/thumb.png
index 78b6cdea..967b6249 100644
Binary files a/pages/02.tutorials/01.User/03.DisApp/thumb.png and b/pages/02.tutorials/01.User/03.DisApp/thumb.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.es.md b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.es.md
index c3d83078..d073ae19 100644
--- a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.es.md
+++ b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.es.md
@@ -60,67 +60,68 @@ Ve a las **Preferencias**. Puedes encontrarlas en el menú de la barra superior.
La ventana de **Preferencias** está divida en pestañas. En la primera, **General**, verás **Apariencia de la conversación**, selecciona en **Comportamiento de la ventana** la opción **“Ventana única para todo”**.
# Extensiones
-Necesitarás configurar dos extensiones.
-Dependiendo de tu sistema operativo, you may have to install them first. [See that page](https://dev.gajim.org/gajim/gajim-plugins)
+Necesitarás configurar dos extensiones. Dependiendo de tu sistema operativo, tal vez tendrías que instalarlas primero. [Mira esta página](https://dev.gajim.org/gajim/gajim-plugins).
-Then, in the same place you found the **Preferences**, you should find **Plugins**.
+En el mismo menú donde se encuentran las **Preferencias**, deberías encontrar las **Extensiones**.
-
+Verifica si tienes instalado el **Plugin Installer** (Instalador de Extensiones)(1), si no lo está, puedes encontrarlo [aquí](https://dev.gajim.org/gajim/gajim-plugins/wikis/plugininstallerplugin) para descargar. Luego de hacerlo, puedes instalarlo haciendo click en el botón *Instalar extensión desde archivo* (2) en el cuadro de las **Extensiones**, para hacer visible la pestaña **Available** (Disponible) (3).
-You need two plugins:
- - OMEMO
- - URL image preview
-(Maybe you'll need to install the Plugin Installer first, which you can find [here](https://dev.gajim.org/gajim/gajim-plugins/wikis/plugininstallerplugin) to download. After the download you can install it by clicking the button *Install from zip* in the **Plugins** window, to get the **Available** tab)
+
-So go to the **Available** tab and check those two plugins. Click on **Install/Upgrade** when you’re done.
+Las extensiones que necesitas son:
+- OMEMO
+- URL image preview
-
+Ve a la pestaña **Available**, busca esas dos extensiones y luego marca la casilla en **Install/Upgrade** cuando estes listx.
-Then, go to the **Installed** tab. Check the plugins to make them active. Then close the windows.
+
-
+Finalmente, ve a la pestaña **Instalado** y selecciona las extensiones para activarlas. Ya puedes cerrar esta ventana.
-# User Interface
-Here is what **Gajim** now looks like:
+
-
+# Interfaz de Usuarix
+Así es cómo se vería **Gajim** ahora:
-1. This is the room discussion window: there you can see everyone's messages in the current room. Here the user is in the *howto@chat.disroot.org* room.
-2. That is where you can type a message, send files, etc.
-3. This is the list of participants of this current room. Only online participants are listed.
-4. This is the list of the user's contacts and connected room (Groupchats)
-5. Here, the user can switch between opened rooms.
+
+
+1. Esta es la ventana de la sala de chat: aquí puedes ver los mensajes de cada unx de lxs participantes de la sala actual. En la imagen el usuario está en la sala *howto@chat.disroot.org*
+2. La caja de envío de mensajes: desde aquí escribes un mensaje, envías archivos, etc.
+3. El **roster** o la lista de contactos y salas de la o el usuarix (Grupos de charla)
+4. Aquí seleccionas tu disponibilidad
+5. Estas pestañas representan las salas abiertas y puedes cambiar entre ellas seleccionando una con un click.
+6. Aquí están lxs participantes de la sala. También puedes ver a sus propietarixs y moderadorxs.
-# Sending and editing messages
-To write/send message to contact or into a room, use the sending message box:
+# Envío y edición de mensajes
+Para escribir/enviar un mensaje a un contacto o sala, utiliza la caja de envío de mensajes:
-
+
-1. You write your message there. **Note:** Shift + Enter will allow you to add a line break.
-2. You can add a smiley.
-3. In **Gajim** you have some format options. But they don't work in other clients. So if you set a text in bold, they won't be seen as bold in other clients.
-4. You can join/send any kind of files. The upload limit is currently of 10MB with **Disroot** XMPP server.
-5. You can change the encryption of the message from Disable to OMEMO (not in open groupchats).
+1. Aquí escribes tus mensajes. **Consejo:** con Shift + Enter puedes agregar un salto de línea.
+2. Acceso a emoticonos.
+3. En **Gajim** tienes algunas opciones de formato. Pero es poco probable que funcionen en otros clientes. Así que si formateas un texto como negrita, lxs demás podrían no verlo como negrita en sus clientes si estos son diferentes de **Gajim**.
+4. Puedes adjuntar/enviar cualquier tipo de archivo. El límite de subida en el servidor XMPP de **Disroot** es actualmente de 10MB.
+5. Puedes cifrar los mensajes con **OMEMO** (la extensión que permite el cifrado de extremo-a-extremo). No puedes cifrar las conversaciones en las salas de chat abiertas.
-Just press the *Enter* key when you want to send your message.
+Presiona *Enter* para enviar tu mensaje.
-You can only edit your last sent message in **Gajim**. To do so, enter the edit message box, press *ctrl* and the up arrow on your keyboard.
+En **Gajim** solo puedes editar tu último mensaje enviado. Para hacerlo, ingresa en la caja de envío de mensajes, presiona la tecla *ctrl* y la flecha arriba en tu teclado.
-
+
-Note that a pencil appears next to the modified message.
+Al final del mensaje modificado aparece ahora un ícono de lápiz que lo denota.
-# Rooms
-## Entering or creating a room
-Room are also called group conversations or MUC (Multiple User Chats).
+# Salas
+## Ingresar o crear una sala
+A las salas también se las conoce como conversaciones grupales o MUC (Multiple User Chats: Conversaciones de Múltiples Usuarixs).
-To join one, click on **Accounts** (top-left corner), then on **Join Group Chat**. There, some group conversations may appear (the ones you have already joined in the past).
+Para unirte a una, ve al menú **Cuentas**, posiciónate sobre tu nombre de usuarix y ve a la opción **Entrar en un salón de chat**. Si alguna vez te uniste a una sala antes, probablemente aparezca aquí.
-
+
-If the room you want to join doesn't appear, click again on **Join Group Chat**. Click also on **Join Group Chat** if you want to create your own room. This window will happen:
+Si la sala a la que quieres entrar no aparece, selecciona **Entrar a un salón de chat**:
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200328_212343.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200328_212343.png
deleted file mode 100644
index c9f08374..00000000
Binary files a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200328_212343.png and /dev/null differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171812.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171812.png
new file mode 100644
index 00000000..ae1f5bbf
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171812.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171831.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171831.png
new file mode 100644
index 00000000..2a5c2b98
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_171831.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222839.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222839.png
new file mode 100644
index 00000000..459045fa
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222839.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222929.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222929.png
new file mode 100644
index 00000000..59547606
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_222929.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230440.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230440.png
new file mode 100644
index 00000000..6f239df8
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230440.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230511.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230511.png
new file mode 100644
index 00000000..c08f0061
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230511.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230520.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230520.png
new file mode 100644
index 00000000..c51063a7
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/Screenshot_20200331_230520.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/caja_mensaje.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/caja_mensaje.png
new file mode 100644
index 00000000..ecd65982
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/caja_mensaje.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/correccion.gif b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/correccion.gif
new file mode 100644
index 00000000..12268c0a
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/correccion.gif differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones.png
new file mode 100644
index 00000000..9b1561c7
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_activas.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_activas.png
new file mode 100644
index 00000000..8057ae7d
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_activas.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_zip.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_zip.png
new file mode 100644
index 00000000..4c96ec15
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/extensiones_zip.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones.png
new file mode 100644
index 00000000..690979e6
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_sala.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_sala.png
new file mode 100644
index 00000000..92f9bd88
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_sala.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_umbral.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_umbral.png
new file mode 100644
index 00000000..b386625f
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/opciones_umbral.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/principal.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/principal.png
new file mode 100644
index 00000000..3a27db8f
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/principal.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_creada.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_creada.png
new file mode 100644
index 00000000..a922a290
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_creada.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_01.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_01.png
new file mode 100644
index 00000000..eeb4342d
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_01.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_02.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_02.png
new file mode 100644
index 00000000..53f4ed73
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_02.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_03.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_03.png
new file mode 100644
index 00000000..f50509b1
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_crear_03.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar.png
new file mode 100644
index 00000000..ca228ac5
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_2.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_2.png
new file mode 100644
index 00000000..894a30b5
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_2.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_crear.png b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_crear.png
new file mode 100644
index 00000000..12b96bf0
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/es/sala_ingresar_crear.png differ