diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 5c6653f2f9e9627db6d8def42379021c4b182625..0000000000000000000000000000000000000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="WizardSettings">
-    <option name="children">
-      <map>
-        <entry key="vectorWizard">
-          <value>
-            <PersistentState>
-              <option name="children">
-                <map>
-                  <entry key="vectorAssetStep">
-                    <value>
-                      <PersistentState>
-                        <option name="values">
-                          <map>
-                            <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_forget" />
-                            <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/check-circle-o.svg" />
-                          </map>
-                        </option>
-                      </PersistentState>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </PersistentState>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index d95db100bb3dfaa8f14ca5c0c53a08aa9f5fdd2d..132b5ec0eb1f5da1765d0626a683a315000c3af0 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/README.md b/README.md
index 62d26ad54d8b4d3bba3bc02c4bed7bcf0efe80ed..1cd16c6f86eee1c137db0a6482daecdcdd4b557c 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,60 @@
-#Disroot app
+[![Chat - xmpp](https://img.shields.io/badge/chat-on%20xmpp-blue.svg)](xmpp:disroot@chat.disroot.org?join)
+[![Donate](https://img.shields.io/badge/donate-appreciation-orange.svg)](https://disroot.org/en/donate)
+[![Donate LiberaPay](https://img.shields.io/badge/donate-liberapay-orange.svg)](https://liberapay.com/Disroot)
 
-This app is a webapp for the site Diroot.org.
+---
+#Disroot app
+Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.  
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community.  
+If you don't have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:  
+* Etherpad
+* Ethercalc
+* Private bin
+* Upload
+* Poll
+* Searx
+* Diaspora* (requires a Diaspora only account)   
 
-*Link to source:*
-...
+The app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google's Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it [here](https://f-droid.org/FDroid.apk).
 
-*Link to APK:*
-...
+####Supported languages:
+* English
+* Spanish
+* French
+* Italian
 
+---
+### Licensing
 Licence GPLv3-only (see licence on source above)
 
-Requiriments:
+#### Device Requirements
 Android 4.1 or +
-4 MB free on Smartphone
+6 MB free on Smartphone
+
+---
+### Privacy & Permissions<a name="privacy"></a>
+This app requires access to the Internet and to external storage to be able to upload and download files.
+
+---
+###contributors
+The project is always open for contributions and accepts pull requests.
+* Massimiliano
+* muppeth
+* antilopa
+* Fede
+* Maryjane
+* meaz
+
+---
+#### Resources
+* Project: [Issues level/beginner](https://git.fosscommunity.in/disroot/disapp/issues) | [License](https://git.fosscommunity.in/disroot/disapp/blob/master/LICENCE.txt)
+* Disroot: [Web](https://disroot.org) | [git](https://git.fosscommunity.in/disroot) | [Hubzilla Channel](https://hub.disroot.org/channel/disroot)
+* F-droid: Not there yet.
 
-###Developed by:
+---
+### Screenshots
+![Screenshot1](app/src/main/assets/screen1.png)![Screenshot2](app/src/main/assets/screen2.png)![Screenshot3](app/src/main/assets/screen3.png)
 
-* Massimiliano:
+---
+### Maintainers
+- Disroot ([git](https://git.fosscommunity.in/disroot), [Web](https://disroot.org), [Hubzilla](https://hub.disroot.org/channel/disroot))
diff --git a/app/build.gradle b/app/build.gradle
index 3b2a6fcaa76192bae75e13d09986d239e813c8cc..1b237ef45ee323da805cb95299018afc0f0c4972 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "org.disroot.disrootapp"
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 5
-        versionName "0.0.5"
+        versionCode 8
+        versionName "0.9.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -21,19 +21,19 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
     //noinspection GradleCompatible
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:design:28.0.0'
     //noinspection GradleCompatible
-    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-v4:28.0.0'
     //noinspection GradleCompatible
-    implementation 'com.android.support:customtabs:27.1.1'
+    implementation 'com.android.support:customtabs:28.0.0'
     //noinspection GradleCompatible
     implementation 'com.android.support:cardview-v7:27.1.1'
 }
@@ -43,4 +43,4 @@ dependencies {
 }
 repositories {
     mavenCentral()
-}
\ No newline at end of file
+}
diff --git a/app/release/output.json b/app/release/output.json
new file mode 100644
index 0000000000000000000000000000000000000000..6a01a5d31083452396af76a200a3d02536b6b018
--- /dev/null
+++ b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.9.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/assets/screen1.png b/app/src/main/assets/screen1.png
new file mode 100644
index 0000000000000000000000000000000000000000..76876e5308c7df9d298f00f91681c34152c11ead
Binary files /dev/null and b/app/src/main/assets/screen1.png differ
diff --git a/app/src/main/assets/screen2.png b/app/src/main/assets/screen2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d121b3fb2e6b91f7627666d711bdc16c9fa63f0
Binary files /dev/null and b/app/src/main/assets/screen2.png differ
diff --git a/app/src/main/assets/screen3.png b/app/src/main/assets/screen3.png
new file mode 100644
index 0000000000000000000000000000000000000000..437c04c01fe9711ea98c406ea2700bcec5517353
Binary files /dev/null and b/app/src/main/assets/screen3.png differ
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java
index a85f3fe591fb9897aeb900d7d2e0fee16a0b539a..49db5671121b27d338a589deb670581a4b2388c8 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/AboutActivity.java
@@ -1,6 +1,6 @@
 package org.disroot.disrootapp.ui;
 
-import android.annotation.SuppressLint;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
@@ -134,7 +134,7 @@ public class AboutActivity extends AppCompatActivity {
             fragment.setArguments(args);
             return fragment;
         }
-        @SuppressLint("SetTextI18n")
+
         @Override
         public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index 6ff362c4c474e3ab9238e065d90920d2ee2e00dd..99e1dc55f22a27f2bd4024fc12f0a9d827603b24 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -1,7 +1,6 @@
 package org.disroot.disrootapp.ui;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.DownloadManager;
@@ -110,7 +109,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         // enables the activity icon as a 'home' button. required if "android:targetSdkVersion" > 14
         //getActionBar().setHomeButtonEnabled(true);
 
-
         final ScrollView dashboard = findViewById(R.id.dashboard);
 
         //progressbarLoading
@@ -142,25 +140,28 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         if (cl.isFirstRun()) {
             cl.getLogDialog().show();
         }
+
+        //set booleans for checking Chat preference
+        if (firstStart.getBoolean("firsttap", true)){
+            check.edit().putBoolean("checkConv",false).apply();
+            check.edit().putBoolean("checkPix",false).apply();
+        }
+
         //Set buttons
         // Locate the button in activity_main.xml
         button = findViewById(R.id.MailBtn);//MailBtn
         button.setOnLongClickListener(new View.OnLongClickListener() {
-
             @Override
             public boolean onLongClick(View v) {
                 showMailInfo();
                 return true;
             }
         });
-
-        // Capture button clicks
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View arg0) {
-                // Start NewActivity.class
                 String k9 = "com.fsck.k9";
                 Intent mail = getPackageManager().getLaunchIntentForPackage(k9);
-                if(mail == null&&(firstStart.getBoolean("firsttap", false))) {
+                if(mail == null) {
                     mail = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+k9));
                 }//first time tap check
                 if (firstStart.getBoolean("firsttap", true)){
@@ -169,8 +170,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 }
                 else startActivity(mail);
             }
+
         });
 
+
         button = findViewById(R.id.CloudBtn);//CloudBtn
         button.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
@@ -257,6 +260,12 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 Intent xmpp1 = getPackageManager().getLaunchIntentForPackage(Conversations);
                 String PixArt = "de.pixart.messenger";
                 Intent xmpp2 = getPackageManager().getLaunchIntentForPackage(PixArt);
+                //first time tap check
+                if (firstStart.getBoolean("firsttap", true)){
+                    showFirstTap();
+                    firstStart.edit().putBoolean("firsttap", false).apply();
+                    return;
+                }
                 if((xmpp1 == null)&&(xmpp2 == null)) {
                     xmpp1 = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+Conversations));
                 }
@@ -266,11 +275,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 }
                 //need to change to give user choise  || check.getBoolean("checkPix",false)
                 if((xmpp1 != null)&&(xmpp2 != null)) {
-                    if(check.getBoolean("checkConv", true)) {
+                    if(check.getBoolean("checkConv", Boolean.parseBoolean(null))||check.getBoolean("checkConv", false)) {
                         startActivity(xmpp1);
                         return;
                     }
-                    if(check.getBoolean("checkPix", true)) {
+                    if(check.getBoolean("checkPix", Boolean.parseBoolean(null))||check.getBoolean("checkPix", false)) {
                         startActivity(xmpp2);
                         return;
                     }
@@ -278,11 +287,6 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                         showChoose();
                     return;
                     }
-                //first time tap check
-                if (firstStart.getBoolean("firsttap", true)){
-                    showFirstTap();
-                    firstStart.edit().putBoolean("firsttap", false).apply();
-                }
                 else
                 startActivity(xmpp1);
             }
@@ -1098,7 +1102,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         }
         return super.onKeyDown(keyCode, event);
     }
-
+    @Override
     public boolean onPrepareOptionsMenu(Menu menu)
     {
         MenuItem register = menu.findItem(R.id.action_forget);
@@ -1122,21 +1126,16 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         // To show icons in the actionbar's overflow menu:
         // http://stackoverflow.com/questions/18374183/how-to-show-icons-in-overflow-menu-in-actionbar
         //if(featureId == Window.FEATURE_ACTION_BAR && menu != null){
-        if(menu.getClass().getSimpleName().equals("MenuBuilder")){
-            try{
-                @SuppressLint("PrivateApi") Method m = menu.getClass().getDeclaredMethod(
-                        "setOptionalIconsVisible", Boolean.TYPE);
-                m.setAccessible(true);
-                m.invoke(menu, true);
-            }
-            catch(NoSuchMethodException e){
-                Log.e(TAG, "onMenuOpened", e);
-            }
-            catch(Exception e){
-                throw new RuntimeException(e);
-            }
+        if(menu.getClass().getSimpleName().equals("MenuBuilder")) try {
+            Method m = menu.getClass().getDeclaredMethod(
+                    "setOptionalIconsVisible", Boolean.TYPE);
+            m.setAccessible(true);
+            m.invoke(menu, true);
+        } catch (NoSuchMethodException e) {
+            Log.e(TAG, "onMenuOpened", e);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
         }
-        //}
 
         return super.onCreateOptionsMenu(menu);
     }
@@ -1173,13 +1172,9 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 }
                 else
                     return true;
-            case R.id.action_forget: {
-                if(check.getBoolean("checkConv", true)||check.getBoolean("checkPix", true)) {
-                    setVisible(true);
-                    showForget();
+            case R.id.action_forget:
+                showForget();
 
-                }
-            }
             case R.id.action_reload: {
                 String url = webView.getUrl();
                 webView.loadUrl(url);
@@ -1198,16 +1193,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 return super.onOptionsItemSelected(item);
         }
     }
-/**
-*    public void setupToolbar() {
- *       Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-  *      ((TextView) toolbar.findViewById(R.id.textview_toolbar_title)).setText(R.string.app_name);
-   *     setSupportActionBar(toolbar);
-    *    ActionBar actionBar = getSupportActionBar();
-     *   if (actionBar != null)
-      *      actionBar.setTitle("");
-    }*/
-    @SuppressLint("SetJavaScriptEnabled")
+
     private void setupWebView(Bundle savedInstanceState, FrameLayout customViewContainer) {
         disWebChromeClient = new DisWebChromeClient(webView, customViewContainer);
         progressBar = findViewById(R.id.progressbarLoading);
@@ -1458,7 +1444,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
 
     private File createImageFile() throws IOException {
         // Create an image file name
-        @SuppressLint("SimpleDateFormat") String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+        String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
         String imageFileName = "JPEG_" + timeStamp + "_";
         File storageDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES);
         return File.createTempFile(
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0da7f106c286b4be68c4f2d79e7b979e17584318..6ee336734f7512c86298c3611c0e24189ff42536 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -199,6 +199,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:maxWidth="24dp"
                 android:drawableTop="@drawable/ic_poll"
                 android:text="@string/action_user"
                 android:textColor="#ffffff" />
@@ -208,6 +209,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:maxWidth="24dp"
                 android:drawableTop="@drawable/ic_state"
                 android:text="@string/action_state"
                 android:textColor="#ffffff" />
@@ -217,6 +219,7 @@
                     style="?android:attr/borderlessButtonStyle"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:maxWidth="24dp"
                     android:drawableTop="@drawable/ic_howto"
                     android:text="@string/action_howto"
                     android:textColor="#ffffff" />
@@ -226,6 +229,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:maxWidth="24dp"
                 android:drawableTop="@drawable/ic_about"
                 android:text="@string/action_about"
                 android:textColor="#ffffff" />
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 40f1ee2febbe0380263d63c9494f18c1890c513b..96be61d8824638a6c992d66023c2f00464c2d01b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -25,17 +25,16 @@
 
     <string name="action_options">Acciones</string>
     <string name="activity_main_share_info">Compartir info</string>
-    <string name="activity_main_manteiners">%s\n\Desarrollador: Massimiliano\n\n contact us:\n<EMAIL mailto="contact@disroot.org">support@disroot.org</EMAIL></string>
     <string name="view_loading_description">Cargando…</string>
     <string name="global_ok">OK</string>
     <string name="more_help">¿Necesitas más ayuda?</string>
+    <string name="tell_more">Tell me more</string>
     <string name="title_activity_about">AboutActivity</string>
-    <string name="title_activity_tap">TapActivity</string>
 
     <string name="MailInfoTitle">Configuración de Correo:</string>
     <string name="MailInfo">IMAP: disroot.org\nSSL Puerto: 993\nAutenticación: Contraseña normal\nSMTP: disroot.org\nSTARTTLS Puerto: 587\nAuthentication: Contraseña normal\nPOP: disroot.org\nSSL Puerto: 995\nAutenticación: Contraseña normal</string>
     <string name="CloudInfoTitle">Configuración de Nextcloud:</string>
-    <string name="CloudInfo">Sincroniza y comparte tus archivos, calendarios, contactos y más.\nUsuario: tu_usuario@disroot.org\nContraseña:tu_contraseña_de_Disroot.</string>
+    <string name="CloudInfo">Sincroniza y comparte tus archivos, calendarios, contactos y más.\n\nHost:\n https://cloud.disroot.org\n\nUsuario: tu_usuario_de_disroot\nContraseña:tu_contraseña_de_Disroot.</string>
     <string name="WelcomeTitle">Bienvenid@</string>
     <string name="WelcomeInfo">Disroot es una plataforma que provee servicios en línea basados en los principios de libertad, privacidad, federación y descentralización.\nEsta aplicación es como la navaja suiza de la plataforma, hecha por la comunidad, para la comunidad.\nSi no tienes una cuenta de Disroot, igual puedes usarla para acceder a todos los servicios de Disroot que no requieran de una:\nEtherpad, Ethercalc, Private bin, Upload, Encuentas, Searx y Diaspora* (requiere tener cuenta solo de Diaspora*)\nLa aplicación podría solicitarte la instalación de otras adicionales, y no todas pueden encontrarse en la Tienda de Aplicaciones. Nosotros recomendamos instalar la tienda F-Droid. Si no la tienes, puedes descargarla tocando el logo de F-Droid.\n</string>
 
@@ -45,18 +44,18 @@
     <string name="action_settings">Configuraciones</string>
     <string name="licenseTitle">Licencia</string>
     <string name="license_button">GNU LGPLv3.0 License</string>
-
+    <!--Non translatable
     <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
         Este programa es software libre: puedes redistribuirlo y/o modificarlo bajo los términos de la Licencia Pública General Reducida de GNU publicada por la Free Software Foundation, versión 3 de la Licencia solamente.\n\n
         Este programa se distribuye esperando que sea útil, pero SIN GARANTÍA; ni siquiera la garantía implícita de comercialización y adecuación para un fin particular. Para más información ver la GNU Lesser General Public License.
-    </string>
+    </string>-->
 
     <string name="maintainersTitle">Mantenimiento</string>
     <string name="maintainersText">Actualmente, esta aplicación está siendo desarrollada y mantenida por\n\n</string>
     <string name="disrootUrl"><a href = "https://disroot.org">https://disroot.org</a></string>
     <string name="disroot"> * Comunidad de Disroot (Disroot):</string>
     <string name="contributorsTitle">Colaboradores</string>
-    <string name="contributors"><b>Massimiliano:</b>\n  Actual desarrollador de la App de Disroot</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n administrador Disroot\n\n<b> &#8226; antilopa:</b>\n administradora Disroot\n\n<b> &#8226; Massimiliano:</b>\n  Desarrollador\n\n<b> &#8226; Fede:</b>\n Contribuyente de contenido\n\n<b> &#8226; Meaz:</b>\n Contribuyente de contenido\n\n</string>
     <string name="fDroid">F-Droid</string>
     <string name="thirdparty">Librerías de Terceros</string>
     <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
@@ -80,7 +79,7 @@
     <string name="SpreadTheWordTxt">Comenta a tus amigos y familia sobre Disroot. O por qué no escribir en un blog sobre tu experiencia. Nos encantaría conocerla.</string>
     <string name="SpreadTheWordBtn">Compartir la aplicación</string>
     <string name="DisrootWeb">Sitio de Disroot</string>
-    <string name="FirstTitle">Casi lo olvido...</string>
+    <string name="FirstTitle">Casi lo olvido…</string>
     <string name="FirstInfo">Haciendo una presión larga sobre el ícono de cada aplicación, puedes ver información extra sobre ella.</string>
     <string name="DiasporaTitle">Configuración de Diaspora*</string>
     <string name="DiasporaInfo">Red social distribuida y descentralizada. Publica, comparte, crea comunidades.\nUsuario: tu_usuario_de_Diaspora@pod.disroot.org\nContraseña: tu_contraseña_de_diaspora</string>
@@ -112,7 +111,21 @@
     <string name="ForumTitle">Foro: crea tu plataforma de comunicaciones</string>
     <string name="ForumInfo">Discourse es una aproximación a los foros de discusión moderna y de código abierto. Ofrece todo lo que tu comunidad, grupo o colectivo necesita para crear su propia plataforma de comunicación, tanto pública como privada.</string>
     <string name="LogoTitle">¿En serio intentaste una presión larga en el logo?</string>
-    <string name="LogoInfo">¿Por qué? Es solo un logo.\nNo seas tan curioso... ;-)</string>
+    <string name="LogoInfo">¿Por qué? Es solo un logo.\nNo seas tan curioso… ;-)</string>
     <string name="LogoBtn">Disroot rules \\o//</string>
     <string name="logo">Logo</string>
+    <string name="xmppBtn"> \ \ &#8226; State on xmpp</string>
+    <string name="matrixBtn"> \ \ &#8226; State on Matrix</string>
+    <string name="SocialBtn"> \ \ &#8226; State on hubzilla/diaspora/mastodon</string>
+    <string name="NewsBtn"> \ \ &#8226; State updates vía email</string>
+    <string name="RssBtn"> \ \ &#8226; State RSS feed</string>
+    <string name="ChooseChatTitle">You have two XMPP clients installed!</string>
+    <string name="ChooseChat">Please choose the client you want to use for Disroot</string>
+    <string name="Remember">Remember my choice</string>
+    <string name="Conversations">Conversations</string>
+    <string name="PixArt">Pix-Art Messenger</string>
+    <string name="Forget">Forget my choice</string>
+    <string name="ForgetTitle">Forget chat client!</string>
+    <string name="title_activity_tap">TapActivity</string>
+
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 028c2f77cf019b3085a40cec1f41cba82c64e291..ec97a617921e09c355a8fd054c7d5087252527f7 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <resources>
-    <string name="app_name">Disroot App</string>
-    <string name="action_home">Home</string>
-    <string name="action_mail">Mail</string>
+    <string name="app_name">Applis Disroot</string>
+    <string name="action_home">Accueil</string>
+    <string name="action_mail">E-mail</string>
     <string name="action_cloud">Cloud</string>
     <string name="action_diaspora">Diaspora*</string>
     <string name="action_forum">Forum</string>
@@ -9,123 +9,122 @@
     <string name="action_pad">Etherpad</string>
     <string name="action_calc">EtherCalc</string>
     <string name="action_bin">Private bin</string>
-    <string name="action_upload">Upload</string>
+    <string name="action_upload">Téléverser</string>
     <string name="action_searx">Searx</string>
-    <string name="action_poll">Poll</string>
-    <string name="action_board">Board</string>
-    <string name="action_user">Password</string>
-    <string name="action_state">State</string>
-    <string name="action_howto">How to</string>
+    <string name="action_poll">Sondage</string>
+    <string name="action_board">Tableau de projet</string>
+    <string name="action_user">Mot de passe</string>
+    <string name="action_state">Etat des services</string>
+    <string name="action_howto">Tutoriaux</string>
 
-    <string name="action_about">About</string>
-    <string name="action_exit">Exit</string>
-    <string name="action_share">Share</string>
-    <string name="action_reload">Reload</string>
+    <string name="action_about">A propos</string>
+    <string name="action_exit">Quitter</string>
+    <string name="action_share">Partager</string>
+    <string name="action_reload">Recharger</string>
 
 
     <string name="action_options">Actions</string>
-    <string name="activity_main_share_info">share link info</string>
-    <string name="activity_main_manteiners">%s\n\nDeveloper: Massimiliano\n\ncontact us:\n<EMAIL mailto="support@disroot.org">support@disroot.org</EMAIL></string>
-    <string name="view_loading_description">Loading…</string>
+    <string name="activity_main_share_info">partager un lien d\'information</string>
+    <string name="view_loading_description">Chargement…</string>
     <string name="global_ok">OK</string>
-    <string name="more_help">Need more help?</string>
-    <string name="tell_more">Tell me more</string>
+    <string name="more_help">Besoin d\'aide?</string>
+    <string name="tell_more">Dites m\'en davantage</string>
     <string name="title_activity_about">AboutActivity</string>
-    <string name="title_activity_tap">TapActivity</string>
-
-    <string name="MailInfoTitle">Mail Settings</string>
-    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
-    <string name="CloudInfoTitle">Nextcloud Settings</string>
-    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
-    <string name="WelcomeTitle">Welcome</string>
-    <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
 
-    <string name="help">Help</string>
-    <string name="license">License</string>
-    <string name="action_settings">Settings</string>
-    <string name="licenseTitle">License</string>
-    <string name="license_button">GNU LGPLv3.0 License</string>
+    <string name="MailInfoTitle">Paramètres e-mail</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal\nMot de passe\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal\nMot de passe\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal\nMot de passe</string>
+    <string name="CloudInfoTitle">Paramètres Nextcloud</string>
+    <string name="CloudInfo">Gardez vos données synchronisées et sécurisées. Avec Nextcloud, vous pouvez partager vos fichiers, calendriers, contacts et plus encore.\n\nServeur:\n https://cloud.disroot.org\n\nNom d\'utilisateur:\n votre_nom_d\'utilisateur_disroot\n\Mot de passe:\n votre_mot_de_passe_disroot.</string>
+    <string name="WelcomeTitle">Bienvenu</string>
+    <string name="WelcomeInfo">Disroot est une plate-forme fournissant des services en ligne basés sur les principes de liberté, de confidentialité, de fédération et de décentralisation.\nCette application est comme votre couteau suisse vers la plate-forme Disroot, faite par la communauté pour la communauté. Si vous n\'avez pas un compte Disroot vous pouvez toujours utiliser cette application pour accéder aux services Disroot qui n\'en nécessitent pas:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Téléverser\n \ \ \ &#8226; Sondage\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (nécessite un compte Diaspora)\n\nL\'application peut vous demander d\'installer des applications supplémentaires. Nous vous recommandons fortement d\'installer F-Droid - un catalogue d\'applications gratuit et open source - car toutes les applications ne se trouvent pas sur le Play Store de Google et F-Droid est plus orienté vers la confidentialité (pas de suivi, pas besoin de compte) vous pouvez le télécharger en tapant sur l\'icône F-droid.\n</string>
 
+    <string name="help">Aide</string>
+    <string name="license">Licence d\'utilisation</string>
+    <string name="action_settings">Paramètres</string>
+    <string name="licenseTitle">Licence d\'utilisation</string>
+    <string name="license_button">Licence d\'utilisations GNU LGPLv3.0</string>
+    <!--Non translatable
     <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
         This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
         This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-    </string>
+    </string>-->
 
-    <string name="maintainersTitle">Maintainers</string>
-    <string name="maintainersText">This app is currently being developed and maintained by\n\n</string>
+    <string name="maintainersTitle">Mainteneurs</string>
+    <string name="maintainersText">Cette application est actuellement développée et maintenue par\n\n</string>
     <string name="disrootUrl">https://disroot.org</string>
-    <string name="disroot"> * Disroot Community (Disroot):</string>
-    <string name="contributorsTitle">Contributors</string>
-    <string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Current developer of the Disroot app\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n</string>
+    <string name="disroot"> * La communauté Disroot (Disroot):</string>
+    <string name="contributorsTitle">Contributeurs</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n Administrateur Disroot\n\n<b> &#8226; antilopa:</b>\n Administrateur Disroot\n\n<b> &#8226; Massimiliano:</b>\n Développeur actuel de l\'application Disroot\n\n<b> &#8226; Fede, Meaz:</b>\n Contributeurs de contenu\n\n</string>
     <string name="fDroid">F-Droid</string>
-    <string name="thirdparty">Third-Party Libraries</string>
-    <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
-    <string name="misc">Miscellaneous</string>
-    <string name="miscDio">We used Diolinx as our starting base to create this app. Go check it out, it\'s free software as well!</string>
-    <string name="miscDioBtn">Tell me more</string>
+    <string name="thirdparty">Librairies tierces</string>
+    <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Licence d\'utilisation Apache 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>Licence d\'utilisation GNU General Public v3.0</string>
+    <string name="misc">Divers</string>
+    <string name="miscDio">Nous avons utilisé Diolinx comme base de départ pour créer cette application. Allez voir, c\'est également un logiciel gratuit!</string>
+    <string name="miscDioBtn">Dite m\'en plus</string>
     <string name="AppSection">Application</string>
-    <string name="AppVersion">App Version: %1$s</string>
-    <string name="Device">Device:</string>
-    <string name="Contribute">Contribute</string>
-    <string name="ContributeText">Disroot app is developed free as in Freedom and follows the ideas of the Disroot Foundation. If you want to contribute, go ahead! Currently we are a very small team, so we greatly appreciate any kind of help!</string>
-    <string name="ContributeBtn">Get the source</string>
-    <string name="Translate">Translate</string>
-    <string name="TranslateText">The app is not available in your language? You can change that! Why don\'t you help us by translating it?</string>
-    <string name="TranslateBtn">Let me translate</string>
-    <string name="Feedback">Give Feedback!</string>
-    <string name="FeedbackText">Disroot app is still in development, so if you have suggestions or any kind of feedback, please let us know!</string>
-    <string name="FeedbackBtn1">Report Bugs</string>
-    <string name="FeedbackBtn2">Chat with us</string>
-    <string name="SpreadTheWord">Spread the word!</string>
-    <string name="SpreadTheWordTxt">Tell your friends and family about Disroot! Why don\'t you blog about your experiences? We\'d love to hear from you!</string>
-    <string name="SpreadTheWordBtn">Share the app</string>
+    <string name="AppVersion">Version de l\'appli: %1$s</string>
+    <string name="Device">Appareil:</string>
+    <string name="Contribute">Contribuer</string>
+    <string name="ContributeText">L\'application Disroot est développée librement et suit les idées de la Fondation Disroot. Si vous voulez contribuer, allez-y ! Pour le moment, nous sommes une très petite équipe, donc nous apprécions beaucoup toute aide !</string>
+    <string name="ContributeBtn">Obtenir la source</string>
+    <string name="Translate">Traduire</string>
+    <string name="TranslateText">L\'application n\'est pas disponible dans votre langue ? Vous pouvez changer ça ! Pourquoi ne pas nous aider en la traduisant ?</string>
+    <string name="TranslateBtn">Permettez-moi de traduire</string>
+    <string name="Feedback">Faites-nous part de vos commentaires !</string>
+    <string name="FeedbackText">L\'application Disroot est encore en développement, donc si vous avez des suggestions ou des commentaires, n\'hésitez pas à nous en faire part !</string>
+    <string name="FeedbackBtn1">Signaler des bugs</string>
+    <string name="FeedbackBtn2">Discuter avec nous</string>
+    <string name="SpreadTheWord">Passez le mot !</string>
+    <string name="SpreadTheWordTxt">Parlez de Disroot à vos amis et à votre famille ! Pourquoi ne bloggez-vous pas sur vos expériences ? Nous adorerions recevoir de vos nouvelles !</string>
+    <string name="SpreadTheWordBtn">Partager l\'application</string>
     <string name="DisrootWeb">Disroot web</string>
-    <string name="FirstTitle">I almost forgot</string>
-    <string name="FirstInfo">You can do a long press on each icon to show you extra information…</string>
-    <string name="DiasporaTitle">Diaspora* Settings</string>
-    <string name="DiasporaInfo">Distributed and decentralized social network. Post, share, like, create communities.\n\nUsername:\n your_diaspora_username@pod.disroot.org\n\nPassword:\n your_diaspora_password</string>
-    <string name="PadInfo">With Etherpad write articles, press releases, to-do lists, etc. together with friends, fellow students or colleagues, all working on the same document at the same time.\nNo registration is required.</string>
-    <string name="PadTitle">EtherPad Info</string>
-    <string name="ChatTitle">XMPP Settings\n</string>
-    <string name="ChatInfo">Conversations is a free, standard and open-source decentralized and federated instant messaging application for chatting with contacts or within groups.\n\nJabber ID :\n Your full Disroot email address\n\nPassword :\n Your Disroot password</string>
-    <string name="CalcInfo">With EtherCalc work together on inventories, survey forms, list management, brainstorming sessions and more!\nNo registration is required.</string>
-    <string name="CalcTitle">EtherCalc Info</string>
-    <string name="BinTitle">PrivateBin Help</string>
-    <string name="BinInfo">PrivateBin is an open-source online pastebin and discussion board. Data is encrypted/decrypted in the browser so that the server has zero knowledge of hosted data. Just paste a text, click “Send”, set expiration (and other features) and share the URL.\nNo registration is required.</string>
-    <string name="UploadTitle">Upload (powered by Lufi) Info</string>
-    <string name="UploadInfo">Upload is a file hosting software that temporarily stores encrypted files so you can share them with others using a link. All files are encrypted before they leave your computer meaning server has zero knowledge of hosted data.\nNo registration is required.</string>
-    <string name="SearxTitle">Searx Info</string>
-    <string name="SearxInfo"> Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users.  No tracking, profiling, no data mining by big corporations. \nNo registration is required.</string>
-    <string name="PollsTitle">Polls Help</string>
-    <string name="PollsInfo">Framadate is an online service for planning an appointment or making a decision quickly and easily.\nNo registration is required.</string>
-    <string name="BoardTitle">Project Management Board Info</string>
-    <string name="BoardInfo">Taiga is a project management tool, developed for programmers, designers and startups working with agile methodology in mind. It can however be applied to virtually any project or group, even outside of IT realm.</string>
-    <string name="UserTitle">User Password Management Help</string>
-    <string name="UserInfo">Use our User Self Service Center to manage your user and password data</string>
-    <string name="StateTitle">State Info</string>
-    <string name="StateInfo">Page to see the current stare of Disroot services. Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we schedule maintenance in which time some services might be unavailable.\n\n<b>Alternative ways to get State updates:</b></string>
-    <string name="state_help">State on XMPP</string>
-    <string name="HowToTitle">How to Info</string>
-    <string name="HowToInfo">Our page with howtos and tutorials to help you find your way around the various Disroot services.</string>
-    <string name="AboutTitle">About Info</string>
-    <string name="AboutInfo">This is the about page of this app</string>
-    <string name="ForumTitle">Forum Help</string>
-    <string name="ForumInfo">Discourse is a fully open-source modern approach to discussion forums. It offers everything your community, group or collective needs to create their communication platform.</string>
-    <string name="LogoTitle">Did you really just try the long press on the logo?</string>
-    <string name="LogoInfo">Why? It\'s just a logo.\nDon\'t be too curious ;-)</string>
-    <string name="LogoBtn">Disroot rules \\o/</string>
+    <string name="FirstTitle">J\'ai failli oublier</string>
+    <string name="FirstInfo">Vous pouvez appuyer longuement sur chaque icône pour afficher des informations supplémentaires…</string>
+    <string name="DiasporaTitle">Paramètres Diaspora*</string>
+    <string name="DiasporaInfo">Réseau social distribué et décentralisé. Postez, partagez, aimez, créez des communautés.\n\Nom d\'utilisateur:\n votre_nom_d\'utilisateur_diaspora@pod.disroot.org\n\nMot de passe:\n votre_mot_de_passe_diaspora</string>
+    <string name="PadInfo">Avec Etherpad, écrivez des articles, des communiqués de presse, des listes de choses à faire, etc. avec des amis, des camarades de classe ou des collègues, travaillant tous en même temps sur le même document.\nAucune inscription n\'est requise.</string>
+    <string name="PadTitle">Info EtherPad</string>
+    <string name="ChatTitle">Paramètres XMPP\n</string>
+    <string name="ChatInfo">Conversations est une application de messagerie instantanée décentralisée et fédérée, gratuite, standard et open-source, pour chatter avec des contacts ou au sein de groupes.\n\nJabber ID :\n Votre adresse email Disroot complète\n\nMot de passe :\n votre mot de passe Disroot</string>
+    <string name="CalcInfo">Avec EtherCalc, travaillez ensemble sur des inventaires, des formulaires d\'enquête, des listes, des sessions de brainstorming et plus encore !\nAucune inscription n\'est requise.</string>
+    <string name="CalcTitle">Info EtherCalc</string>
+    <string name="BinTitle">Aide PrivateBin</string>
+    <string name="BinInfo">PrivateBin est un pastebin et un forum de discussion en ligne open-source. Les données sont chiffrées et déchiffrées dans le navigateur afin que le serveur n\'ait aucune connaissance des données hébergées. Il suffit de coller un texte, de cliquer sur "Envoyer", de définir l\'expiration (et d\'autres fonctionnalités) et de partager l\'URL.\nAucune inscription n\'est requise.</string>
+    <string name="UploadTitle">Info Téléverser (propulsé par Lufi)</string>
+    <string name="UploadInfo">Téléverser est un logiciel d\'hébergement de fichiers qui stocke temporairement des fichiers chiffrés pour que vous puissiez les partager avec d\'autres en utilisant un lien. Tous les fichiers sont chiffrés avant qu\'ils ne quittent votre ordinateur, ce qui signifie que le serveur n\'a aucune connaissance des données hébergées.</string>
+    <string name="SearxTitle">Info Searx</string>
+    <string name="SearxInfo"> Searx est une plateforme anonyme multi moteurs de recherche, agrégeant les résultats d\'autres moteurs de recherche tout en ne stockant pas d\'informations sur ses utilisateurs.  Pas de suivi, pas de profilage, pas d\'exploration de données par les grandes entreprises.\nAucune inscription n\'est requise.</string>
+    <string name="PollsTitle">Aide Sondages</string>
+    <string name="PollsInfo">Framadate est un service en ligne pour planifier un rendez-vous ou prendre une décision rapidement et facilement.\nAucune inscription n\'est requise.</string>
+    <string name="BoardTitle">Info sur le tableau de projets</string>
+    <string name="BoardInfo">Taiga est un outil de gestion de projet, développé pour les programmeurs, les concepteurs et les startups travaillant avec une méthodologie de gestion agile à l\'esprit. Il peut cependant s\'appliquer à pratiquement n\'importe quel projet ou groupe, même en dehors du domaine informatique.</string>
+    <string name="UserTitle">Aide à la gestion des mots de passe des utilisateurs</string>
+    <string name="UserInfo">Utilisez notre Centre de libre-service pour gérer vos données d\'utilisateur et de mot de passe.</string>
+    <string name="StateTitle">Informations sur l\'état des services</string>
+    <string name="StateInfo">Page pour voir l\'état actuel des services Disroot. Ici, vous pouvez voir si un service a un problème, s\'il y a des problèmes de performance, ainsi que de savoir quand nous programmons la maintenance dans le temps où certains services pourraient ne pas être disponibles.\n\n<b>D\'autres moyens d\'obtenir des mises à jour sur l\'état des services</b></string>
+    <string name="state_help">Etat des services sur XMPP</string>
+    <string name="HowToTitle">Info Tutoriaux</string>
+    <string name="HowToInfo">Notre page avec des tutoriaux pour vous aider à vous y retrouver parmi les différents services Disroot.</string>
+    <string name="AboutTitle">Info A propos</string>
+    <string name="AboutInfo">Accédez à la page "A propos" de cette application</string>
+    <string name="ForumTitle">Aide du Forum</string>
+    <string name="ForumInfo">Discourse est une approche moderne et entièrement open-source des forums de discussion. Il offre tout ce dont votre communauté, groupe ou collectif a besoin pour créer sa plateforme de communication.</string>
+    <string name="LogoTitle">Vous venez vraiment d\'essayer la pression longue sur le logo ?</string>
+    <string name="LogoInfo">Pourquoi ? C\'est juste un logo. Ne soyez pas trop curieux. ;-)</string>
+    <string name="LogoBtn">Règles Disroot \\o/</string>
     <string name="logo">Logo</string>
-    <string name="xmppBtn"> \ \ &#8226; State on xmpp</string>
-    <string name="matrixBtn"> \ \ &#8226; State on Matrix</string>
-    <string name="SocialBtn"> \ \ &#8226; State on hubzilla/diaspora/mastodon</string>
-    <string name="NewsBtn"> \ \ &#8226; State updates via email</string>
-    <string name="RssBtn"> \ \ &#8226; State RSS feed</string>
-    <string name="ChooseChatTitle">You have two XMPP clients installed!</string>
-    <string name="ChooseChat">Please choose the client you want to use for Disroot</string>
-    <string name="Remember">Remember my choise</string>
+    <string name="xmppBtn"> \ \ &#8226; Etat des services sur xmpp</string>
+    <string name="matrixBtn"> \ \ &#8226; Etat des services sur Matrix</string>
+    <string name="SocialBtn"> \ \ &#8226; Etat des services sur hubzilla/diaspora/mastodon</string>
+    <string name="NewsBtn"> \ \ &#8226; Info sur l\'état des services par email</string>
+    <string name="RssBtn"> \ \ &#8226; Etat des services par flux RSS</string>
+    <string name="ChooseChatTitle">Vous avez deux clients XMPP installés !</string>
+    <string name="ChooseChat">Veuillez choisir le client que vous souhaitez utiliser pour Disroot</string>
+    <string name="Remember">Mémoriser mon choix</string>
     <string name="Conversations">Conversations</string>
     <string name="PixArt">Pix-Art Messenger</string>
-    <string name="Forget">Forget my choise</string>
-    <string name="ForgetTitle">Forget chat client!</string>
+    <string name="Forget">Oublier mon choix</string>
+    <string name="ForgetTitle">Oublier le client de chat !</string>
+    <string name="title_activity_tap">TapActivity</string>
 
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..343de3b6b29351984e653b0902e37b76a49f41cd
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,130 @@
+<resources>
+    <string name="app_name">Disroot App</string>
+    <string name="action_home">Home</string>
+    <string name="action_mail">E-Mail</string>
+    <string name="action_cloud">Cloud</string>
+    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_forum">Forum</string>
+    <string name="action_chat">Chat</string>
+    <string name="action_pad">Etherpad</string>
+    <string name="action_calc">EtherCalc</string>
+    <string name="action_bin">Private bin</string>
+    <string name="action_upload">Upload</string>
+    <string name="action_searx">Searx</string>
+    <string name="action_poll">Poll</string>
+    <string name="action_board">Lavagna</string>
+    <string name="action_user">Password</string>
+    <string name="action_state">Stato</string>
+    <string name="action_howto">Manuali</string>
+
+    <string name="action_about">Info</string>
+    <string name="action_exit">Esci</string>
+    <string name="action_share">Condividi</string>
+    <string name="action_reload">Ricarica</string>
+
+
+    <string name="action_options">Azioni</string>
+    <string name="activity_main_share_info">Condividi info link</string>
+    <string name="view_loading_description">Caricamento…</string>
+    <string name="global_ok">OK</string>
+    <string name="more_help">Bisogno di più aiuto?</string>
+    <string name="tell_more">Dimmi di più</string>
+    <string name="title_activity_about">Info</string>
+
+    <string name="MailInfoTitle">Impostazioni Mail</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAutenticazione: Password Normale\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAutenticazione: Password Normale\n\nPOP: disroot.org\nSSL Port 995\nAutenticazione: Password Normale</string>
+    <string name="CloudInfoTitle">Impostazioni Nextcloud</string>
+    <string name="CloudInfo">Tieni i tuoi dati sincronizzati e al sicuro. Con Nextcloud puoi condividere file, calendari, contatti e altro ancora.\n\nHost:\n https://cloud.disroot.org\n\nnnome utente:\n il_tuo_nome_utente_disroot\n\nPassword:\n la_tua_password_disroot</string>
+    <string name="WelcomeTitle">Benvenuto</string>
+    <string name="WelcomeInfo">Disroot è una piattaforma che fornisce servizi online basati su principi di libertà, privacy, federazione e decentralizzazione.\nQuesta applicazione è come il tuo coltellino svizzero per la piattaforma Disroot, fatta dalla comunità per la comunità.\nSe non hai un account Disroot puoi comunque utilizzare questa app per accedere a tutti i servizi Disroot che non richiedono un account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (richiede un conto solo per Diaspora)\n\nLa app potrebbe richiedere l\'installazione di applicazioni aggiuntive. Si consiglia vivamente di installare F-Droid - una app sotre gratuita e open source - in quanto non tutte le applicazioni possono essere trovate su Google Play Store e F-Droid è più orientato alla privacy (nessun tracking, nessun account necessario) è possibile scaricarlo toccando l\'icona F-Droid.\n</string>
+
+    <string name="help">Aiuto</string>
+    <string name="license">Licenza</string>
+    <string name="action_settings">Impostazioni</string>
+    <string name="licenseTitle">Licenza</string>
+    <string name="license_button">Licenze GNU LGPLv3.0</string>
+    <!--Non translatable
+    <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
+        This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
+        This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+    </string>-->
+
+    <string name="maintainersTitle">Manutentori</string>
+    <string name="maintainersText">Questa app è attualmente in fase di sviluppo e manutenuta da parte di\n\n</string>
+    <string name="disrootUrl">https://disroot.org</string>
+    <string name="disroot"> * Comunità Disroot (Disroot):</string>
+    <string name="contributorsTitle">Contribuenti</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n Amministratore Disroot\n\n<b> &#8226; antilopa:</b>\n Amministratrice Disroot\n\n<b> &#8226; Massimiliano:</b>\n Sviluppatore\n\n<b> &#8226; Fede:</b>\n Contributore di contenuti\n\n<b> &#8226; Meaz:</b>\n Contributore di contenuti\n\n</string>
+    <string name="fDroid">F-Droid</string>
+    <string name="thirdparty">Librerie di terze parti</string>
+    <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
+    <string name="misc">Varie</string>
+    <string name="miscDio">Abbiamo usato Diolinx come base di partenza per creare questa applicazione. Vai a dare un\'occhiata, è anche software libero!</string>
+    <string name="miscDioBtn">Dimmi di più</string>
+    <string name="AppSection">Applicazione</string>
+    <string name="AppVersion">Versione App: %1$s</string>
+    <string name="Device">Dispositivo:</string>
+    <string name="Contribute">Contribuisci</string>
+    <string name="ContributeText">L\'applicazione Disroot è sviluppata gratuitamente come in Libertà e segue le idee della Fondazione Disroot. Se vuoi contribuire, vai avanti! Attualmente siamo un team molto piccolo, quindi apprezziamo molto qualsiasi tipo di aiuto!</string>
+    <string name="ContributeBtn">Ottieni la fonte</string>
+    <string name="Translate">Traduci</string>
+    <string name="TranslateText">La appnon è disponibile nella tua lingua? Puoi cambiarlo! Perché non ci aiuti a tradurla?</string>
+    <string name="TranslateBtn">Lasciatemi tradurre</string>
+    <string name="Feedback">Dai Feedback!</string>
+    <string name="FeedbackText">La app Disroot è ancora in fase di sviluppo, quindi se avete suggerimenti o qualsiasi tipo di feedback, fatecelo sapere!</string>
+    <string name="FeedbackBtn1">Segnala bug</string>
+    <string name="FeedbackBtn2">Chatta con noi</string>
+    <string name="SpreadTheWord">Spargete la voce!</string>
+    <string name="SpreadTheWordTxt">Racconta ai tuoi amici e familiari di Disroot! Perché non scrivi sul tuo blog le tue esperienze? Ci farebbe molto piacere sentirti!</string>
+    <string name="SpreadTheWordBtn">Condividi la app</string>
+    <string name="DisrootWeb">Disroot web</string>
+    <string name="FirstTitle">Quasi dimenticavo</string>
+    <string name="FirstInfo">È possibile premere a lungo su ogni icona per visualizzare informazioni aggiuntive.…</string>
+    <string name="DiasporaTitle">Impostazioni Diaspora*</string>
+    <string name="DiasporaInfo">Rete sociale distribuita e decentralizzata. Pubblicare, condividere, tipo, creare comunità.\n\nNome utente:\n il_tuo_nome_utente_diaspora_@pod.disroot.org\n\nPassword:\n la_tua_password_diaspora</string>
+    <string name="PadInfo">Con Etherpad scrivere articoli, comunicati stampa, liste di cose da fare, ecc. insieme ad amici, compagni di studio o colleghi, tutti che lavorano sullo stesso documento allo stesso tempo.\nNon è richiesta alcuna registrazione.</string>
+    <string name="PadTitle">Info EtherPad</string>
+    <string name="ChatTitle">Impostazioni XMPP\n</string>
+    <string name="ChatInfo">Conversations è una app gratuita, standard e open-source, decentralizzata e federata di messaggistica istantanea per chattare con i contatti o all\'interno di gruppi.\n\nID Jabber :\n Il tuo indirizzo e-mail completo Disroot\n\nPassword :\n La tua password di Disroot</string>
+    <string name="CalcInfo">Con EtherCalc puoi lavorare insieme su inventari, moduli di indagine, gestione degli elenchi, sessioni di brainstorming e molto altro ancora!\nNon è richiesta alcuna registrazione.</string>
+    <string name="CalcTitle">Info EtherCalc</string>
+    <string name="BinTitle">Aiuto PrivateBin</string>
+    <string name="BinInfo">PrivateBin è un pastebin online open-source e un forum di discussione. I dati sono criptati/decodificati nel browser in modo che il server non abbia alcuna conoscenza dei dati ospitati. Basta incollare un testo, fare clic su “Invia”, impostare la scadenza (e altre caratteristiche) e condividere l\'URL.\nNon è richiesta alcuna registrazione.</string>
+    <string name="UploadTitle">Info Upload (powered by Lufi)</string>
+    <string name="UploadInfo">Upload è un software di file hosting che memorizza temporaneamente i file crittografati in modo da poterli condividere con altri utilizzando un link. Tutti i file vengono crittografati prima di lasciare il computer, il che significa che il server non ha conoscenza dei dati ospitati.\nNon è richiesta alcuna registrazione.</string>
+    <string name="SearxTitle">Info Searx</string>
+    <string name="SearxInfo">Searx è una piattaforma anonima multimotore di ricerca, che aggrega i risultati di altri motori di ricerca senza memorizzare informazioni sui suoi utenti.  Nessun monitoraggio, profilazione, nessun data mining da parte delle grandi aziende. \nNon è richiesta alcuna registrazione.</string>
+    <string name="PollsTitle">Aiuto Polls</string>
+    <string name="PollsInfo">Framadate è un servizio online per pianificare un appuntamento o prendere una decisione in modo semplice e veloce.\nNon è richiesta alcuna registrazione.</string>
+    <string name="BoardTitle">Info Lavagna Gestione di progetti</string>
+    <string name="BoardInfo">Taiga è uno strumento di project management, sviluppato per programmatori, progettisti e startup che lavorano con una metodologia agile in mente. Può tuttavia essere applicato praticamente a qualsiasi progetto o gruppo, anche al di fuori dell\'ambito IT.</string>
+    <string name="UserTitle">Aiuto Gestione delle password utente</string>
+    <string name="UserInfo">Utilizza il nostro User Self Service Center per gestire i tuoi dati utente e password.</string>
+    <string name="StateTitle">Info sullo stato</string>
+    <string name="StateInfo">Pagina per vedere lo stato attuale dei servizi Disroot. Qui potete vedere se un qualsiasi servizio ha un problema, se ci sono problemi di prestazioni, così come conoscere quando pianifichiamo la manutenzione e in quale momento alcuni servizi potrebbero non essere disponibili.\n\n<b>Modi alternativi per ottenere gli aggiornamenti di Stato:</b></string>
+    <string name="state_help">Stato su XMPP</string>
+    <string name="HowToTitle">Info su manuali</string>
+    <string name="HowToInfo">La nostra pagina con manuali e tutorial per aiutarti a orientarti nei vari servizi Disroot.</string>
+    <string name="AboutTitle">Info</string>
+    <string name="AboutInfo">Questa è la pagina Info di questa app</string>
+    <string name="ForumTitle">Aiuto Forum</string>
+    <string name="ForumInfo">Discourse è un approccio moderno e completamente open-source ai forum di discussione. Offre tutto ciò di cui la vostra comunità, gruppo o collettivo ha bisogno per creare la loro piattaforma di comunicazione.</string>
+    <string name="LogoTitle">Hai davvero provato la pressione lunga sul logo?</string>
+    <string name="LogoInfo">Perche? E\' solo un logo.\nNon essere troppo curioso. ;-)</string>
+    <string name="LogoBtn">Disroot rules \\o/</string>
+    <string name="logo">Logo</string>
+    <string name="xmppBtn"> \ \ &#8226; Stato su xmpp</string>
+    <string name="matrixBtn"> \ \ &#8226; Stato su Matrix</string>
+    <string name="SocialBtn"> \ \ &#8226; Stato su hubzilla/diaspora/mastodon</string>
+    <string name="NewsBtn"> \ \ &#8226; Aggiornamenti di stato via e-mail</string>
+    <string name="RssBtn"> \ \ &#8226; Stato su RSS feed</string>
+    <string name="ChooseChatTitle">Sono installati due client XMPP!</string>
+    <string name="ChooseChat">Scegliere il cliente che si desidera utilizzare per Disroot</string>
+    <string name="Remember">Ricorda la mia scelta</string>
+    <string name="Conversations">Conversations</string>
+    <string name="PixArt">Pix-Art Messenger</string>
+    <string name="Forget">Dimentica la mia scelta</string>
+    <string name="ForgetTitle">Dimentica il client di chat!</string>
+    <string name="title_activity_tap">TapActivity</string>
+
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb62a60f024c8c55b4ee29cb3a17f1bb671e48d0
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,131 @@
+<resources>
+    <string name="app_name">Disroot App</string>
+    <string name="action_home">Home</string>
+    <string name="action_mail">Mail</string>
+    <string name="action_cloud">Cloud</string>
+    <string name="action_diaspora">Diaspora*</string>
+    <string name="action_forum">Forum</string>
+    <string name="action_chat">Chat</string>
+    <string name="action_pad">Etherpad</string>
+    <string name="action_calc">EtherCalc</string>
+    <string name="action_bin">Private bin</string>
+    <string name="action_upload">Upload</string>
+    <string name="action_searx">Searx</string>
+    <string name="action_poll">Poll</string>
+    <string name="action_board">Bord</string>
+    <string name="action_user">Wachtwoord</string>
+    <string name="action_state">Status</string>
+    <string name="action_howto">How to</string>
+
+    <string name="action_about">Over</string>
+    <string name="action_exit">Exit</string>
+    <string name="action_share">Delen</string>
+    <string name="action_reload">Herladen</string>
+
+
+    <string name="action_options">Acties</string>
+    <string name="activity_main_share_info">Deel link info</string>
+    <string name="view_loading_description">Laden…</string>
+    <string name="global_ok">OK</string>
+    <string name="more_help">Meer hulp nodig?</string>
+    <string name="tell_more">Vertel me meer</string>
+    <string name="title_activity_about">AboutActivity</string>
+
+    <string name="MailInfoTitle">Mail Instellingen</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthenticatie: Normal\nWachtwoord\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthenticatie: Normal\nWachtwoord\n\nPOP: disroot.org\nSSL Port 995\nAuthenticatie: Normal\nWachtwoord</string>
+    <string name="CloudInfoTitle">Nextcloud Instellingen</string>
+    <string name="CloudInfo">Houd uw gegevens gesynchroniseerd en veilig. Met Nextcloud kunt u uw bestanden, kalenders, contactpersonen en meer delen.\n\nHost:\n https://cloud.disroot.org\n\nGebruikersnaam:\n uw_disroot_gebruikersnaam\n\nWachtwoord:\n uw_disroot_wachtwoord.</string>
+    <string name="WelcomeTitle">Welkom</string>
+    <string name="WelcomeInfo">Disroot is een platform dat online diensten aanbiedt op basis van de principes van vrijheid, privacy, federatie en decentralisatie.\n Deze app is als een Zwitsers mes voor het Disroot platform, gemaakt door de gemeenschap voor de gemeenschap.\nAls je geen Disroot account hebt kun je deze app nog steeds gebruiken om toegang te krijgen tot alle Disroot diensten dat geen account vereist:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (vereist een Diaspora elleen account)\n\nDe app kan vereisen dat u extra apps installeert. We raden u ten zeerste aan om F-Droid - een gratis en open source app marktplaats te installeren, omdat niet alle apps te vinden zijn in de Play Store van Google en F-Droid meer privacy georiënteerd is (geen tracking, geen account nodig), u kunt het downloaden door op het F-droid icoontje te tikken.\n</string>
+
+    <string name="help">Help</string>
+    <string name="license">Licentie</string>
+    <string name="action_settings">Instellingen</string>
+    <string name="licenseTitle">Licentie</string>
+    <string name="license_button">GNU LGPLv3.0 Licentie</string>
+
+    <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
+        This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
+        This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+    </string>
+
+    <string name="maintainersTitle">Onderhouders</string>
+    <string name="maintainersText">Deze app wordt momenteel ontwikkeld en onderhouden door\n\n</string>
+    <string name="disrootUrl">https://disroot.org</string>
+    <string name="disroot"> * Disroot Gemeenschap (Disroot):</string>
+    <string name="contributorsTitle">Bijdragers</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n Disroot administrator\n\n<b> &#8226; antilopa:</b>\n Disroot administrator\n\n<b> &#8226; Massimiliano:</b>\n Ontwikkelaar\n\n<b> &#8226; Fede:</b>\n Inhoud bijdrager\n\n<b> &#8226; Meaz:</b>\n Inhoud bijdrager\n\n</string>
+    <string name="fDroid">F-Droid</string>
+    <string name="thirdparty">Third-Party Libraries</string>
+    <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache Licentie 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
+    <string name="misc">Diversen</string>
+    <string name="miscDio"We hebben Diolinx als uitgangspunt gebruikt om deze app te maken. Ga eens kijken, het is ook vrije software!</string>
+    <string name="miscDioBtn">Vertel me meer</string>
+    <string name="AppSection">Applicatie</string>
+    <string name="AppVersion">App Versie: %1$s</string>
+    <string name="Device">Toestel:</string>
+    <string name="Contribute">Draag bij</string>
+    <string name="ContributeText">Disroot app is vrij ontwikkeld zoals in Vrijheid en volgt de ideeën van de Disroot Stichting. Als je een bijdrage wilt leveren, ga je gang! Momenteel zijn we een heel klein team, dus we stellen elke vorm van hulp zeer op prijs!</string>
+    <string name="ContributeBtn">Krijg de broncode</string>
+    <string name="Translate">Vertaal</string>
+    <string name="TranslateText">Is de app niet beschikbaar in uw taal? Dat kan je veranderen! Waarom help je ons niet door het te vertalen?</string>
+    <string name="TranslateBtn">Laat me vertalen</string>
+    <string name="Feedback">Geef Feedback!</string>
+    <string name="FeedbackText">Disroot app is nog in ontwikkeling, dus als je suggesties of feedback hebt, laat het ons weten!</string>
+    <string name="FeedbackBtn1">Meld bugs</string>
+    <string name="FeedbackBtn2">Chat met ons</string>
+    <string name="SpreadTheWord">Spreid het woord!</string>
+    <string name="SpreadTheWordTxt">Vertel je vrienden en familie over Disroot! Waarom blogt je niet over jou ervaringen? We horen graag van je!</string>
+    <string name="SpreadTheWordBtn">Deel de app</string>
+    <string name="DisrootWeb">Disroot web</string>
+    <string name="FirstTitle">Ik vergat bijna</string>
+    <string name="FirstInfo">Je kan op elk pictogram lang drukken om jou extra informatie te tonen…</string>
+    <string name="DiasporaTitle">Diaspora* Instellingen</string>
+    <string name="DiasporaInfo">Gedistribueerd en gedecentraliseerd sociaal netwerk. Plaatsen, delen, liken, gemeenschappen creëren.\n\nGebruikersnaam:\n jou_diaspora_gebruikersnaam@pod.disroot.org\n\nWachtwoord:\n jou_diaspora_wachtwoord</string>
+    <string name="PadInfo">Met Etherpad schrijf artikelen, persberichten, to-do lijsten, etc. samen met vrienden, medestudenten of collega's, die allemaal op hetzelfde moment aan hetzelfde document werken.\nEr is geen registratie vereist.</string>
+    <string name="PadTitle">EtherPad Info</string>
+    <string name="ChatTitle">XMPP Instellingen\n</string>
+    <string name="ChatInfo">Conversations is een gratis, standaard en open-source gedecentraliseerde en gefedereerde instant messaging applicatie voor chatten met contacten of binnen groepen.
+\n\nJabber ID :\n Jou Volledig Disroot email adres\n\nWachtwoord :\n Jou Disroot wachtwoord</string>
+    <string name="CalcInfo">Met EtherCalc werken we samen aan inventarissen, enquêteformulieren, lijstbeheer, brainstormsessies en meer.\nEr is geen registratie vereist.</string>
+    <string name="CalcTitle">EtherCalc Info</string>
+    <string name="BinTitle">PrivateBin Help</string>
+    <string name="BinInfo">PrivateBin is een open-source online pastebin en discussiebord. De gegevens worden gecodeerd/gedecodeerd in de browser, zodat de server geen kennis heeft van gehoste gegevens. Plak gewoon een tekst, klik op "Verzenden", stel de vervaldatum in (en andere functies) en deel de URL.\nEr is geen registratie vereist.</string>
+    <string name="UploadTitle">Upload (powered by Lufi) Info</string>
+    <string name="UploadInfo">Upload is een file hosting software die tijdelijk versleutelde bestanden opslaat, zodat u ze kunt delen met anderen via een link. Alle bestanden worden gecodeerd voordat ze uw computer verlaten, wat betekent dat de server geen kennis heeft van gehoste gegevens.\nEr is geen registratie vereist.</string>
+    <string name="SearxTitle">Searx Info</string>
+    <string name="SearxInfo">Searx is een anoniem multi zoekmachine platform, dat de resultaten van andere zoekmachines samenvoegt en geen informatie over de gebruikers opslaat.  Geen tracking, geen profilering, geen data mining door grote bedrijven.\nEr is geen registratie vereist.</string>
+    <string name="PollsTitle">Polls Help</string>
+    <string name="PollsInfo">Framadate is een online dienst om snel en eenvoudig een afspraak te plannen of een beslissing te nemen.\nEr is geen registratie vereist.</string>
+    <string name="BoardTitle">Project Management Bord Info</string>
+    <string name="BoardInfo">Taiga is een project management tool, ontwikkeld voor programmeurs, ontwerpers en startups die werken met een flexibele methodologie in gedachten. Het kan echter op vrijwel elk project of groep worden toegepast, zelfs buiten de IT-omgeving.</string>
+    <string name="UserTitle">Gebruikerswachtwoordbeheer Help</string>
+    <string name="UserInfo">Gebruik ons User Self Service Center om uw gebruikers- en wachtwoordgegevens te beheren</string>
+    <string name="StateTitle">Status Info</string>
+    <string name="StateInfo">Pagina om de huidige status van Disroot diensten te zien. Hier kunt u zien of een service een probleem heeft, of er prestatieproblemen zijn, en wanneer we onderhoud plannen in welke tijd sommige services niet beschikbaar zijn.\n\n<b>Alternatieve manieren om de status updates te krijgen:</b></string>
+    <string name="state_help">Status on XMPP</string>
+    <string name="HowToTitle">How to Info</string>
+    <string name="HowToInfo">Onze pagina met howtos en tutorials om je te helpen je weg te vinden in de verschillende Disroot diensten.</string>
+    <string name="AboutTitle">Over Info</string>
+    <string name="AboutInfo">Dit is de over-pagina van deze app</string>
+    <string name="ForumTitle">Forum Help</string>
+    <string name="ForumInfo">Discourse is een volledig open-source moderne benadering van discussiefora. Het biedt alles wat uw gemeenschap, groep of collectief nodig heeft om hun communicatieplatform te creëren.</string>
+    <string name="LogoTitle">Heb je echt gewoon de lange druk op het logo geprobeerd?</string>
+    <string name="LogoInfo">Waarom? Het is gewoon een logo.\n Wees niet te nieuwsgierig  ;-)</string>
+    <string name="LogoBtn">Disroot rules \\o/</string>
+    <string name="logo">Logo</string>
+    <string name="xmppBtn"> \ \ &#8226; Status op xmpp</string>
+    <string name="matrixBtn"> \ \ &#8226; Status op Matrix</string>
+    <string name="SocialBtn"> \ \ &#8226; Status op hubzilla/diaspora/mastodon</string>
+    <string name="NewsBtn"> \ \ &#8226; Status updates via email</string>
+    <string name="RssBtn"> \ \ &#8226; Status RSS feed</string>
+    <string name="ChooseChatTitle">Je hebt twee XMPP-clients geïnstalleerd!</string>
+    <string name="ChooseChat">Kies de client die je wenst te gebruiken voor Disroot</string>
+    <string name="Remember">Onthoud mijn keuze</string>
+    <string name="Conversations">Conversations</string>
+    <string name="PixArt">Pix-Art Messenger</string>
+    <string name="Forget">Vergeet mijn keuze</string>
+    <string name="ForgetTitle">Vergeet chat client!</string>
+    <string name="title_activity_tap">TapActivity</string>
+
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bf1769fcbc033e22aa35614b7e6fc1bd93fcc3d5..d5527788568cafbcb3005c0612d4d829696b1f6f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -23,39 +23,38 @@
     <string name="action_reload">Recarregar</string>
 
 
-    <string name="action_options">Acções</string>
-    <string name="activity_main_share_info">Partilhar informação do link</string>
-    <string name="activity_main_manteiners">%s\n\nDeveloper: Massimiliano\n\ncontacta-nos:\n<EMAIL mailto="support@disroot.org">support@disroot.org</EMAIL></string>
-    <string name="view_loading_description">A carregar…</string>
+    <string name="action_options">Actions</string>
+    <string name="activity_main_share_info">share link info</string>
+    <string name="view_loading_description">Loading…</string>
     <string name="global_ok">OK</string>
     <string name="more_help">Precisa de mais ajuda?</string>
     <string name="tell_more">Contem-me mais</string>
     <string name="title_activity_about">AboutActivity</string>
-    <string name="title_activity_tap">TapActivity</string>
 
-    <string name="MailInfoTitle">Configuração de email</string>
-    <string name="MailInfo">IMAP: disroot.org\nSSL Porta 993\nAutenticação: Password Normal\n\nSMTP: disroot.org\nSTARTTLS Porta 587\nAutenticação: Password Normal\n\nPOP: disroot.org\nSSL Porta 995\nAutenticação: Password Normal</string>
-    <string name="CloudInfoTitle">Configuração do Nextcloud</string>
-    <string name="CloudInfo">Mantenha os seus dados sincronizados e seguros. Com o Nextcloud você pode partilhar os seus ficheiros, calendários, contactos e mais.\nServidor: \nhttps://cloud.disroot.org\nNome de utilizador:\n o_seu_nome_de_utilizador@disroot.org\n\nPassword:\n a_sua_password_disroot.</string>
-    <string name="WelcomeTitle">Bem-vindo</string>
-    <string name="WelcomeInfo">O Disroot é uma platforma que providencia serviços online baseados nos principios de freedom, privacidade, federação and decentralização.\nEsta aplicação é como o seu canivete Suiço para a plataforma Disroot, feito pela comunidade para a comunidade.\nSe não tem uma conta disroot pode usar esta aplicação na mesma para aceder a todos os serviços do Disroot que não precisam de uma conta de utilizador:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requer uma conta de utilizador especifica para o Diaspora)\n\nA Aplicação pode requerer que instale aplicações adicionais. Recomendamos-lhe vivamente que instale o F-Droid - uma loja de aplicações livre e open-source pois nem todas as aplicações podem ser encontradas na Play Store da Google e o F-Droid é mais orientado para a privacidade (sem tracking, sem precisar de conta de utilizador) pode descarrega-lo carregando no ícone do F-droid.\n</string>
-    <string name="help">Ajuda</string>
-    <string name="license">Licença</string>
-    <string name="action_settings">Definições</string>
-    <string name="licenseTitle">Licença</string>
-    <string name="license_button">Licença GNU LGPLv3.0</string>
+    <string name="MailInfoTitle">Mail Settings</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
+    <string name="CloudInfoTitle">Nextcloud Settings</string>
+    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nHost:\n https://cloud.disroot.org\n\nUsername:\n your_disroot_username\n\nPassword:\n your_disroot_password.</string>
+    <string name="WelcomeTitle">Welcome</string>
+    <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
 
+    <string name="help">Help</string>
+    <string name="license">License</string>
+    <string name="action_settings">Settings</string>
+    <string name="licenseTitle">License</string>
+    <string name="license_button">GNU LGPLv3.0 License</string>
+    <!--Non translatable
     <string translatable="false" name="licenseText">Copyright © 2007 Free Software Foundation, Inc.\n
         This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, version 3 of the License only.\n\n
         This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-    </string>
+    </string>-->
 
     <string name="maintainersTitle">Equipa</string>
     <string name="maintainersText">Esta aplicação é desenvolvida e mantida por\n\n</string>
     <string name="disrootUrl">https://disroot.org</string>
-    <string name="disroot"> * Comunidade Disroot (Disroot):</string>
-    <string name="contributorsTitle">Contribuidores</string>
-    <string name="contributors"><b> &#8226; muppeth:</b>\n Administrador do Disroot\n\n<b> &#8226; antilopa:</b>\n Administrador do Disroot\n\n<b> &#8226; Massimiliano:</b>\n Desenvolvedor actual da Disroot app\n\n<b> &#8226; Fede:</b>\n Content contribudor de conteúdos\n\n<b> &#8226; Meaz:</b>\n Content contribudor de conteúdos\n\n</string>
+    <string name="disroot"> * Disroot Community (Disroot):</string>
+    <string name="contributorsTitle">Contributors</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Current developer of the Disroot app\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n<b> &#8226; Meaz:</b>\n Content contributor\n\n</string>
     <string name="fDroid">F-Droid</string>
     <string name="thirdparty">Bibliotecas de Terceiros</string>
     <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
@@ -124,7 +123,8 @@
     <string name="Remember">Lembrar a minha escolha</string>
     <string name="Conversations">Conversations</string>
     <string name="PixArt">Pix-Art Messenger</string>
-    <string name="Forget">Esquecer a minha escolha</string>
-    <string name="ForgetTitle">Esquecer esse cliente!</string>
+    <string name="Forget">Forget my choise</string>
+    <string name="ForgetTitle">Forget chat client!</string>
+    <string name="title_activity_tap">TapActivity</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 028c2f77cf019b3085a40cec1f41cba82c64e291..0ddb1ddcadc84702596552b5fa93e356761d1a8f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,19 +24,17 @@
 
 
     <string name="action_options">Actions</string>
-    <string name="activity_main_share_info">share link info</string>
-    <string name="activity_main_manteiners">%s\n\nDeveloper: Massimiliano\n\ncontact us:\n<EMAIL mailto="support@disroot.org">support@disroot.org</EMAIL></string>
+    <string name="activity_main_share_info">Share link info</string>
     <string name="view_loading_description">Loading…</string>
     <string name="global_ok">OK</string>
     <string name="more_help">Need more help?</string>
     <string name="tell_more">Tell me more</string>
     <string name="title_activity_about">AboutActivity</string>
-    <string name="title_activity_tap">TapActivity</string>
 
     <string name="MailInfoTitle">Mail Settings</string>
-    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal Password\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal Password\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal Password</string>
+    <string name="MailInfo">IMAP: disroot.org\nSSL Port 993\nAuthentication: Normal\nPassword\n\nSMTP: disroot.org\nSTARTTLS Port 587\nAuthentication: Normal\nPassword\n\nPOP: disroot.org\nSSL Port 995\nAuthentication: Normal\nPassword</string>
     <string name="CloudInfoTitle">Nextcloud Settings</string>
-    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nUsername:\n your_username@disroot.org\n\nPassword:\n your_disroot_password.</string>
+    <string name="CloudInfo">Keep your data synchronized and safe. With Nextcloud you can share your files, calendars, contacts and more.\n\nHost:\n https://cloud.disroot.org\n\nUsername:\n your_disroot_username\n\nPassword:\n your_disroot_password.</string>
     <string name="WelcomeTitle">Welcome</string>
     <string name="WelcomeInfo">Disroot is a platform providing online services based on principles of freedom, privacy, federation and decentralization.\nThis app is like your Swiss Army knife to the Disroot platform, made by the community for the community.\nIf you don\'t have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:\n \ \ \ &#8226; Etherpad\n \ \ \ &#8226; Ethercalc\n \ \ \ &#8226; Private bin\n \ \ \ &#8226; Upload\n \ \ \ &#8226; Poll\n \ \ \ &#8226; Searx\n \ \ \ &#8226; Diaspora* (requires a Diaspora only account)\n\nThe app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google\'s Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it by tapping on the F-droid icon.\n</string>
 
@@ -56,7 +54,7 @@
     <string name="disrootUrl">https://disroot.org</string>
     <string name="disroot"> * Disroot Community (Disroot):</string>
     <string name="contributorsTitle">Contributors</string>
-    <string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Current developer of the Disroot app\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n</string>
+    <string name="contributors"><b> &#8226; muppeth:</b>\n Disroot admin\n\n<b> &#8226; antilopa:</b>\n Disroot admin\n\n<b> &#8226; Massimiliano:</b>\n Developer\n\n<b> &#8226; Fede:</b>\n Content contributor\n\n<b> &#8226; Meaz:</b>\n Content contributor\n\n</string>
     <string name="fDroid">F-Droid</string>
     <string name="thirdparty">Third-Party Libraries</string>
     <string name="thirdpartyText"><a href="https://github.com/cketti/ckChangeLog">ckCangelog: </a>Apache License 2.0\n\n<a href="https://github.com/wsdfhjxc/taponium/">Taponium: </a>GNU General Public License v3.0</string>
@@ -95,7 +93,7 @@
     <string name="UploadTitle">Upload (powered by Lufi) Info</string>
     <string name="UploadInfo">Upload is a file hosting software that temporarily stores encrypted files so you can share them with others using a link. All files are encrypted before they leave your computer meaning server has zero knowledge of hosted data.\nNo registration is required.</string>
     <string name="SearxTitle">Searx Info</string>
-    <string name="SearxInfo"> Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users.  No tracking, profiling, no data mining by big corporations. \nNo registration is required.</string>
+    <string name="SearxInfo">Searx is an anonymous multi search engine platform, aggregating the results of other search engines while not storing information about its users.  No tracking, profiling, no data mining by big corporations. \nNo registration is required.</string>
     <string name="PollsTitle">Polls Help</string>
     <string name="PollsInfo">Framadate is an online service for planning an appointment or making a decision quickly and easily.\nNo registration is required.</string>
     <string name="BoardTitle">Project Management Board Info</string>
@@ -103,7 +101,7 @@
     <string name="UserTitle">User Password Management Help</string>
     <string name="UserInfo">Use our User Self Service Center to manage your user and password data</string>
     <string name="StateTitle">State Info</string>
-    <string name="StateInfo">Page to see the current stare of Disroot services. Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we schedule maintenance in which time some services might be unavailable.\n\n<b>Alternative ways to get State updates:</b></string>
+    <string name="StateInfo">Page to see the current state of Disroot services. Here you can see if any service has a problem, if there are any performance issues, as well as get to know when we schedule maintenance in which time some services might be unavailable.\n\n<b>Alternative ways to get State updates:</b></string>
     <string name="state_help">State on XMPP</string>
     <string name="HowToTitle">How to Info</string>
     <string name="HowToInfo">Our page with howtos and tutorials to help you find your way around the various Disroot services.</string>
@@ -122,10 +120,11 @@
     <string name="RssBtn"> \ \ &#8226; State RSS feed</string>
     <string name="ChooseChatTitle">You have two XMPP clients installed!</string>
     <string name="ChooseChat">Please choose the client you want to use for Disroot</string>
-    <string name="Remember">Remember my choise</string>
+    <string name="Remember">Remember my choice</string>
     <string name="Conversations">Conversations</string>
     <string name="PixArt">Pix-Art Messenger</string>
-    <string name="Forget">Forget my choise</string>
+    <string name="Forget">Forget my choice</string>
     <string name="ForgetTitle">Forget chat client!</string>
+    <string name="title_activity_tap">TapActivity</string>
 
 </resources>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d0f4b0e1d8a5550efc9b352712a251ca686305f2..e65eb5ddd02ce24c0ad0101d5c7926b71daacb74 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+  <release version="0.9.3" versioncode="8" >
+      <changelog>Fixed chatroom redirection</changelog>
+      <changelog>Added Dutch translation</changelog>
+  </release>
+    <release version="0.9.2" versioncode="7" >
+        <changelog>Fixed cloud tip</changelog>
+        <change>Fixed app crash on tapping mail icon</change>
+        <change>Fixed first time asking xmpp client</change>
+        <change>Italian translation added</change>
+        <change>fixed Spanish typos</change>
+        <change>fixed French typos</change>
+    </release>
+    <release version="0.9.1" versioncode="6" >
+        <change>French translation added</change>
+        <change>Spanish translation added</change>
+        <change>Changed some minor content strings</change>
+    </release>
     <release version="0.0.5" versioncode="5" >
         <change>User choice of chat client whit remember option</change>
         <change>All content of dialog box is added, ready for review</change>
diff --git a/build.gradle b/build.gradle
index 077cb2fc551d8f872981b59253496e7c33a7166f..8231d45fda13801223cb1345c47e86578fe1f958 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,23 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
-
 allprojects {
     repositories {
         google()
         jcenter()
     }
 }
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 59d25f8b8bc0a1cc6225909fbaf023a5998761aa..32d773ed3bd6a0dcf4ec44bb15d54f1c70e7b756 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Sep 01 13:24:54 CEST 2018
+#Tue Sep 25 19:46:31 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/metadata/en b/metadata/en
new file mode 120000
index 0000000000000000000000000000000000000000..f2b0341fed0d85a5d78aaea8829f0b92b90e7e6e
--- /dev/null
+++ b/metadata/en
@@ -0,0 +1 @@
+en-US
\ No newline at end of file
diff --git a/metadata/en-US/featureGraphic.png b/metadata/en-US/featureGraphic.png
new file mode 100644
index 0000000000000000000000000000000000000000..5166344db908180f1680d746d742595d0a1ebf3c
Binary files /dev/null and b/metadata/en-US/featureGraphic.png differ
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0676014f9fda2766dedcd53b1a4cf71f6971a688
--- /dev/null
+++ b/metadata/en-US/full_description.txt
@@ -0,0 +1,22 @@
+<b>Disroot</b> is a platform providing online services based on principles of freedom, privacy, federation and decentralization.
+This app is like your Swiss Army knife to the Disroot platform, made by the community for the community.
+If you don't have a Disroot account you can still use this  app to access all the Disroot services that do not require an account:
+* Etherpad
+* Ethercalc
+* Private bin
+* Upload
+* Poll
+* Searx
+* Diaspora* (requires a Diaspora only account)
+
+The app may require you to install additional apps. We highly recommend you install F-Droid - a free and open source app marketplace - as not all apps can be found on Google's Play Store and F-Droid is more privacy oriented (no tracking, no account needed) you can download it [here](https://f-droid.org/FDroid.apk).
+
+<b>Supported languages:</b>
+* English
+* Spanish
+* French
+* Italian
+
+<b>Support the project:</b>
+ ✋ Join discussion on <a href="xmpp:disroot@chat.disroot.org">xmpp:disroot@chat.disroot.org</a>
+ ✋ Connect with us <a href="https://hub.disroot.org/channel/disroot</a>
diff --git a/metadata/en-US/icon.png b/metadata/en-US/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2aac9bcef4603ef9ddf8ec2fee6a5cf34b00207
Binary files /dev/null and b/metadata/en-US/icon.png differ
diff --git a/metadata/en-US/phoneScreenshots/01.png b/metadata/en-US/phoneScreenshots/01.png
new file mode 100644
index 0000000000000000000000000000000000000000..76876e5308c7df9d298f00f91681c34152c11ead
Binary files /dev/null and b/metadata/en-US/phoneScreenshots/01.png differ
diff --git a/metadata/en-US/phoneScreenshots/02.png b/metadata/en-US/phoneScreenshots/02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d121b3fb2e6b91f7627666d711bdc16c9fa63f0
Binary files /dev/null and b/metadata/en-US/phoneScreenshots/02.png differ
diff --git a/metadata/en-US/promoGraphic.png b/metadata/en-US/promoGraphic.png
new file mode 100644
index 0000000000000000000000000000000000000000..799b47fb2c91565b961433c7f39c038078e3a537
Binary files /dev/null and b/metadata/en-US/promoGraphic.png differ
diff --git a/metadata/en-US/short_description.txt b/metadata/en-US/short_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0bd490a5800c5d0f93693c73aa1a9e28ce36d8d5
--- /dev/null
+++ b/metadata/en-US/short_description.txt
@@ -0,0 +1 @@
+This app is like your Swiss Army knife to the Disroot platform
diff --git a/metadata/en-US/title.txt b/metadata/en-US/title.txt
new file mode 100644
index 0000000000000000000000000000000000000000..55296c4c04474e9d99b278643deb9fc3c7c1a6d4
--- /dev/null
+++ b/metadata/en-US/title.txt
@@ -0,0 +1 @@
+Disroot app