From e762779e2612b3e43b75ec7dcdda4522103ba0a8 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Mon, 31 Dec 2018 09:29:12 -0600
Subject: [PATCH] Strings reorganized issue #3

---
 P2Play.iml                                    | 16 ---
 app/app.iml                                   |  3 +-
 app/build.gradle                              |  2 +-
 app/src/main/res/values-es/aboutActivity.xml  |  9 --
 app/src/main/res/values-es/hostActivity.xml   |  5 -
 app/src/main/res/values-es/loginActivity.xml  | 18 ----
 app/src/main/res/values-es/mainActivity.xml   | 14 ---
 app/src/main/res/values-es/menu.xml           |  7 --
 app/src/main/res/values-es/miniMenu.xml       |  6 --
 .../res/values-es/reproductorActivity.xml     |  9 --
 .../main/res/values-es/settingsActivity.xml   | 17 ----
 app/src/main/res/values-es/strings.xml        | 87 ++++++++++++++++
 app/src/main/res/values/aboutActivity.xml     | 11 ---
 app/src/main/res/values/hostActivity.xml      |  7 --
 app/src/main/res/values/loginActivity.xml     | 24 -----
 app/src/main/res/values/mainActivity.xml      | 15 ---
 app/src/main/res/values/menu.xml              |  8 --
 app/src/main/res/values/miniMenu.xml          |  6 --
 .../main/res/values/reproductorActivity.xml   | 19 ----
 app/src/main/res/values/settingsActivity.xml  | 17 ----
 app/src/main/res/values/strings.xml           | 98 ++++++++++++++++++-
 build.gradle                                  |  2 +-
 22 files changed, 184 insertions(+), 216 deletions(-)
 delete mode 100644 P2Play.iml
 delete mode 100644 app/src/main/res/values-es/aboutActivity.xml
 delete mode 100644 app/src/main/res/values-es/hostActivity.xml
 delete mode 100644 app/src/main/res/values-es/loginActivity.xml
 delete mode 100644 app/src/main/res/values-es/mainActivity.xml
 delete mode 100644 app/src/main/res/values-es/menu.xml
 delete mode 100644 app/src/main/res/values-es/miniMenu.xml
 delete mode 100644 app/src/main/res/values-es/reproductorActivity.xml
 delete mode 100644 app/src/main/res/values-es/settingsActivity.xml
 create mode 100644 app/src/main/res/values-es/strings.xml
 delete mode 100644 app/src/main/res/values/aboutActivity.xml
 delete mode 100644 app/src/main/res/values/hostActivity.xml
 delete mode 100644 app/src/main/res/values/loginActivity.xml
 delete mode 100644 app/src/main/res/values/mainActivity.xml
 delete mode 100644 app/src/main/res/values/menu.xml
 delete mode 100644 app/src/main/res/values/miniMenu.xml
 delete mode 100644 app/src/main/res/values/reproductorActivity.xml
 delete mode 100644 app/src/main/res/values/settingsActivity.xml

diff --git a/P2Play.iml b/P2Play.iml
deleted file mode 100644
index c96a6e5..0000000
--- a/P2Play.iml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="p2play" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 233e049..e1aef5e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -22,13 +22,14 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
+          <option name="jvmTarget" value="1.8" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
           <option name="languageVersion" value="1.2" />
diff --git a/app/build.gradle b/app/build.gradle
index 783ca36..4f37ec5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    buildToolsVersion '28.0.2'
+    buildToolsVersion '28.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
         targetCompatibility JavaVersion.VERSION_1_6
diff --git a/app/src/main/res/values-es/aboutActivity.xml b/app/src/main/res/values-es/aboutActivity.xml
deleted file mode 100644
index d1d7d70..0000000
--- a/app/src/main/res/values-es/aboutActivity.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="aboutLabel">Sobre P2Play</string>
-    <string name="aboutText">P2Play es una aplicacion no-oficial de PeerTube. Tu puedes ver y cntribuir con el codigo en GitLab:</string>
-    <string name="aboutStatus">Puedes subscribirte a nuestro perfil en GNU Social:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
-    <string name="aboutInstance">Sobre la instancia</string>
-    <string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/hostActivity.xml b/app/src/main/res/values-es/hostActivity.xml
deleted file mode 100644
index 692bd52..0000000
--- a/app/src/main/res/values-es/hostActivity.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hostInfoText">Selecciona la instancia que prefieras</string>
-    <string name="okButton">Aceptar</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/loginActivity.xml b/app/src/main/res/values-es/loginActivity.xml
deleted file mode 100644
index 667e269..0000000
--- a/app/src/main/res/values-es/loginActivity.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="loginInfo">Acceder o crear una cuenta nueva</string>
-    <string name="userTxt">Usuario:</string>
-    <string name="userText"></string>
-    <string name="passwordTxt">Contraseña:</string>
-    <string name="passwordText"></string>
-    <string name="loginBtn">Ingresar</string>
-    <string name="registerActionBtn">Crear una cuenta</string>
-    <string name="emailTxt">Correo:</string>
-    <string name="emailText">user@mail.com</string>
-    <string name="registerBtn">Registrar ahora</string>
-
-    <!-- Toast msg -->
-    <string name="loginSuccess_msg">Te has identificado</string>
-    <string name="loginError_msg">Ha ocurrido un error</string>
-    <string name="loginFailed_msg">Credenciales invalidas</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/mainActivity.xml b/app/src/main/res/values-es/mainActivity.xml
deleted file mode 100644
index 23ee7ba..0000000
--- a/app/src/main/res/values-es/mainActivity.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_recent">Recientes</string>
-    <string name="title_popular">Populares</string>
-    <string name="title_local">Locales</string>
-    <string name="title_myVideos">Mis videos</string>
-    <string name="view_text">vistas</string>
-    <string name="time_text">segundos</string>
-    <string name="nav_header_title">Inicia session</string>
-    <string name="nav_header_subtitle">P2Play (alfa)</string>
-
-    <!-- Toast msg -->
-    <string name="logout_msg">Te has desconectado</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/menu.xml b/app/src/main/res/values-es/menu.xml
deleted file mode 100644
index 4958477..0000000
--- a/app/src/main/res/values-es/menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="nav_popular">Populares</string>
-    <string name="nav_recent">Recientes</string>
-    <string name="nav_local">Local</string>
-    <string name="nav_about">Sobre</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/miniMenu.xml b/app/src/main/res/values-es/miniMenu.xml
deleted file mode 100644
index cc4009b..0000000
--- a/app/src/main/res/values-es/miniMenu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="action_settings">Configuracion</string>
-    <string name="action_login">Acceder</string>
-    <string name="action_logout">Cerrar sesion</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/reproductorActivity.xml b/app/src/main/res/values-es/reproductorActivity.xml
deleted file mode 100644
index 0804759..0000000
--- a/app/src/main/res/values-es/reproductorActivity.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="descriptionTxt">Descripcion:</string>
-    <string name="likeBtn">Like</string>
-    <string name="dislikeBtn">Dislike</string>
-    <string name="shareBtn">Compartir</string>
-    <string name="reportBtn">Reportar</string>
-    <string name="subscribeBtn">Subscribir</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/settingsActivity.xml b/app/src/main/res/values-es/settingsActivity.xml
deleted file mode 100644
index 612dffb..0000000
--- a/app/src/main/res/values-es/settingsActivity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_activity_settings">Configuracion</string>
-
-    <!-- Strings related to Settings -->
-
-    <!-- Example General settings -->
-    <string name="pref_header_general">General</string>
-
-    <string name="pref_nfsw_title">Contenido NFSW</string>
-    <string name="pref_nfsw_description">Si es activado podria mostrar contenido para adultos o sencible.</string>
-
-    <string name="pref_hostname_title">Instancia Peertube</string>
-    <string name="pref_hostname_error">-</string>
-
-    <string name="pref_message_exit">Reinicia para aplicar los cambios</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..02ef70b
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Start Global strings -->
+    <string name="comming">Proximamente</string>
+    <!-- End Global strings -->
+
+    <!-- Start About strings -->
+    <string name="aboutLabel">Sobre P2Play</string>
+    <string name="aboutText">P2Play es una aplicacion no-oficial de PeerTube. Tu puedes ver y cntribuir con el codigo en GitLab:</string>
+    <string name="aboutStatus">Puedes subscribirte a nuestro perfil en GNU Social:</string>
+    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutInstance">Sobre la instancia</string>
+    <string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
+    <!-- End About strings -->
+    <!-- Start Host strings -->
+    <string name="hostInfoText">Selecciona la instancia que prefieras</string>
+    <string name="okButton">Aceptar</string>
+    <string name="errorMsg">Error, intenta de nuevo</string>
+    <string name="finallyMsg">Instancia guardada</string>
+    <!-- End Host strings -->
+    <!-- Start Login strings -->
+    <string name="loginInfo">Acceder o crear una cuenta nueva</string>
+    <string name="userTxt">Usuario:</string>
+    <string name="passwordTxt">Contraseña:</string>
+    <string name="loginBtn">Ingresar</string>
+    <string name="registerActionBtn">Crear una cuenta</string>
+    <!-- Toast msg -->
+    <string name="loginSuccess_msg">Te has identificado</string>
+    <string name="loginError_msg">Ha ocurrido un error</string>
+    <string name="loginFailed_msg">Credenciales invalidas</string>
+    <string name="registerSuccess_msg">Te has registrado</string>
+    <string name="registerError_msg">Ha ocurrido un error</string>
+    <string name="registerFailed_msg">Datos invalidos</string>
+    <!-- Register msg -->
+    <string name="emailTxt">Correo:</string>
+    <string name="registerBtn">Registrar ahora</string>
+    <!-- End Login strings -->
+    <!-- Start Main strings -->
+    <string name="title_recent">Recientes</string>
+    <string name="title_popular">Populares</string>
+    <string name="title_local">Locales</string>
+    <string name="title_subscriptions">Suscripciones</string>
+    <string name="title_myVideos">Mis videos</string>
+    <string name="view_text">vistas</string>
+    <string name="time_text">segundos</string>
+    <string name="nav_header_title">Inicia session</string>
+    <string name="nav_header_subtitle">P2Play (alfa)</string>
+    <!-- Toast msg -->
+    <string name="logout_msg">Te has desconectado</string>
+    <!-- End Main strings -->
+    <!-- Start Menu strings -->
+    <string name="nav_popular">Populares</string>
+    <string name="nav_recent">Recientes</string>
+    <string name="nav_local">Local</string>
+    <string name="nav_about">Sobre</string>
+    <string name="nav_subscriptions">Suscripciones</string>
+    <!-- End Menu strings -->
+    <!-- Start MiniMenu strings -->
+    <string name="action_settings">Configuracion</string>
+    <string name="action_login">Acceder</string>
+    <string name="action_logout">Cerrar sesion</string>
+    <!-- End MiniMenu strings -->
+    <!-- Start Reproductor strings -->
+    <string name="descriptionTxt">Descripcion:</string>
+    <!-- Actions -->
+    <string name="likeBtn">Like</string>
+    <string name="dislikeBtn">Dislike</string>
+    <string name="shareBtn">Compartir</string>
+    <string name="reportBtn">Reportar</string>
+    <string name="subscribeBtn">Subscribir</string>
+    <string name="unSubscribeBtn">Desubscribir</string>
+    <!-- Messages -->
+    <string name="subscribeMsg">Te has subscribido a este canal</string>
+    <string name="rateMsg">Has valorado este video</string>
+    <string name="unSubscribeMsg">Te has desubscribido de este canal</string>
+    <!-- End Reproductor strings -->
+    <!-- Start Settings strings -->
+    <string name="title_activity_settings">Configuracion</string>
+    <!-- Example General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_nfsw_title">Contenido NFSW</string>
+    <string name="pref_nfsw_description">Si es activado podria mostrar contenido para adultos o sencible.</string>
+    <string name="pref_hostname_title">Instancia Peertube</string>
+    <string name="pref_message_exit">Reinicia para aplicar los cambios</string>
+    <!-- End Settings strings -->
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/aboutActivity.xml b/app/src/main/res/values/aboutActivity.xml
deleted file mode 100644
index 9d36d64..0000000
--- a/app/src/main/res/values/aboutActivity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="aboutGitUrl">https://gitlab.com/agosto182/p2play/</string>
-    <string name="aboutGnuUrl">https://gnusocial.ml/p2play</string>
-    <string name="aboutLabel">About P2Play</string>
-    <string name="aboutText">P2Play is an Android application unnoficial of PeerTube. You can watch and contribute with the code on GitLab:</string>
-    <string name="aboutStatus">You can subscribe to our profile on GNU Social:</string>
-    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
-    <string name="aboutInstance">About instance</string>
-    <string name="aboutInWeb">You can see terms and more on the web:</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/hostActivity.xml b/app/src/main/res/values/hostActivity.xml
deleted file mode 100644
index 2bb33e2..0000000
--- a/app/src/main/res/values/hostActivity.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="hostInfoText">Selecciona la instancia que prefieras</string>
-    <string name="okButton">Aceptar</string>
-    <string name="errorMsg">Error, try again</string>
-    <string name="finallyMsg">Host saved</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/loginActivity.xml b/app/src/main/res/values/loginActivity.xml
deleted file mode 100644
index 4b5b609..0000000
--- a/app/src/main/res/values/loginActivity.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="loginInfo">Login or register new account</string>
-    <string name="userTxt">Username:</string>
-    <string name="userText"></string>
-    <string name="passwordTxt">Password:</string>
-    <string name="passwordText"></string>
-    <string name="loginBtn">Login now</string>
-    <string name="registerActionBtn">Create new account</string>
-
-    <!-- Toast msg -->
-    <string name="loginSuccess_msg">You are logged</string>
-    <string name="loginError_msg">An error has ocurred</string>
-    <string name="loginFailed_msg">Invalid credentials</string>
-    <string name="registerSuccess_msg">You are registered</string>
-    <string name="registerError_msg">An error has ocurred</string>
-    <string name="registerFailed_msg">Invalid data</string>
-
-    <!-- Register msg -->
-    <string name="registerBtn">Register now</string>
-    <string name="emailTxt">Email:</string>
-    <string name="emailText">user@mail.com</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/mainActivity.xml b/app/src/main/res/values/mainActivity.xml
deleted file mode 100644
index d62afef..0000000
--- a/app/src/main/res/values/mainActivity.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_subscriptions">Subscriptions</string>
-    <string name="title_recent">Recent videos</string>
-    <string name="title_popular">Popular videos</string>
-    <string name="title_local">Local videos</string>
-    <string name="title_myVideos">My videos</string>
-    <string name="view_text">views</string>
-    <string name="time_text">seconds</string>
-    <string name="nav_header_title">Log In</string>
-    <string name="nav_header_subtitle">P2Play</string>
-
-    <!-- Toast msg -->
-    <string name="logout_msg">You are disconnected</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/menu.xml b/app/src/main/res/values/menu.xml
deleted file mode 100644
index c25957e..0000000
--- a/app/src/main/res/values/menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="nav_subscriptions">Subscriptions</string>
-    <string name="nav_popular">Popular</string>
-    <string name="nav_recent">Recent</string>
-    <string name="nav_local">Local</string>
-    <string name="nav_about">About</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/miniMenu.xml b/app/src/main/res/values/miniMenu.xml
deleted file mode 100644
index b4cfde8..0000000
--- a/app/src/main/res/values/miniMenu.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="action_settings">Settings</string>
-    <string name="action_login">Log In</string>
-    <string name="action_logout">Logout</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/reproductorActivity.xml b/app/src/main/res/values/reproductorActivity.xml
deleted file mode 100644
index bf2b5be..0000000
--- a/app/src/main/res/values/reproductorActivity.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="descriptionTxt">Description:</string>
-
-    <!-- Actions -->
-    <string name="subscribeBtn">Subscribe</string>
-    <string name="likeBtn">Like</string>
-    <string name="dislikeBtn">Dislike</string>
-    <string name="shareBtn">Share</string>
-    <string name="reportBtn">Report</string>
-
-    <string name="unSubscribeBtn">Unsubscribe</string>
-
-    <!-- Messages -->
-    <string name="subscribeMsg">You are subscribed to this channel</string>
-    <string name="rateMsg">You are rated the video</string>
-    <string name="unSubscribeMsg">You are unsubscribed to this channel</string>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/settingsActivity.xml b/app/src/main/res/values/settingsActivity.xml
deleted file mode 100644
index ba74549..0000000
--- a/app/src/main/res/values/settingsActivity.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="title_activity_settings">Settings</string>
-
-    <!-- Strings related to Settings -->
-
-    <!-- Example General settings -->
-    <string name="pref_header_general">General</string>
-
-    <string name="pref_nfsw_title">NFSW content</string>
-    <string name="pref_nfsw_description">If is active may show the adult and sensitive content.</string>
-
-    <string name="pref_hostname_title">Peertube instance</string>
-    <string name="pref_hostname_error">-</string>
-
-    <string name="pref_message_exit">Restart app to apply changes</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9a6b1f1..ed838c1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,98 @@
 <resources>
+    <!-- Start Global string -->
     <string name="app_name" translatable="false">P2Play</string>
-    <string name="hostText">peertube.example.com</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_desc">Navigation header</string>
-
+    <string name="hostText" translatable="false">peertube.example.com</string>
+    <string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
+    <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
+    <string name="nav_header_desc" translatable="false">Navigation header</string>
     <string name="comming">Comming soon!</string>
+    <!-- End Global string -->
+
+
+    <!-- Start About strings -->
+    <string name="aboutGitUrl" translatable="false">https://gitlab.com/agosto182/p2play/</string>
+    <string name="aboutGnuUrl" translatable="false">https://gnusocial.ml/p2play</string>
+    <string name="aboutLabel">About P2Play</string>
+    <string name="aboutText">P2Play is an Android application unnoficial of PeerTube. You can watch and contribute with the code on GitLab:</string>
+    <string name="aboutStatus">You can subscribe to our profile on GNU Social:</string>
+    <string name="aboutLicense">Copyleft GNU GPLv3 License</string>
+    <string name="aboutInstance">About instance</string>
+    <string name="aboutInWeb">You can see terms and more on the web:</string>
+    <!-- End About strings -->
+    <!-- Start Host strings -->
+    <string name="hostInfoText">Select your instance</string>
+    <string name="okButton">Accept</string>
+    <string name="errorMsg">Error, try again</string>
+    <string name="finallyMsg">Host saved</string>
+    <!-- End Host strings -->
+    <!-- Start Login strings -->
+    <string name="loginInfo">Login or register new account</string>
+    <string name="userTxt">Username:</string>
+    <string name="userText" translatable="false"> </string>
+    <string name="passwordTxt">Password:</string>
+    <string name="passwordText" translatable="false"> </string>
+    <string name="loginBtn">Login now</string>
+    <string name="registerActionBtn">Create new account</string>
+    <!-- Toast msg -->
+    <string name="loginSuccess_msg">You are logged</string>
+    <string name="loginError_msg">An error has ocurred</string>
+    <string name="loginFailed_msg">Invalid credentials</string>
+    <string name="registerSuccess_msg">You are registered</string>
+    <string name="registerError_msg">An error has ocurred</string>
+    <string name="registerFailed_msg">Invalid data</string>
+    <!-- Register msg -->
+    <string name="registerBtn">Register now</string>
+    <string name="emailTxt">Email:</string>
+    <string name="emailText" translatable="false">user@mail.com</string>
+    <!-- End Login strings -->
+    <!-- Start Main strings -->
+    <string name="title_subscriptions">Subscriptions</string>
+    <string name="title_recent">Recent videos</string>
+    <string name="title_popular">Popular videos</string>
+    <string name="title_local">Local videos</string>
+    <string name="title_myVideos">My videos</string>
+    <string name="view_text">views</string>
+    <string name="time_text">seconds</string>
+    <string name="nav_header_title">Log In</string>
+    <string name="nav_header_subtitle">P2Play</string>
+    <!-- Toast msg -->
+    <string name="logout_msg">You are disconnected</string>
+    <!-- End Main strings -->
+    <!-- Start Menu strings -->
+    <string name="nav_subscriptions">Subscriptions</string>
+    <string name="nav_popular">Popular</string>
+    <string name="nav_recent">Recent</string>
+    <string name="nav_local">Local</string>
+    <string name="nav_about">About</string>
+    <!-- End Menu strings -->
+    <!-- Start MiniMenu strings -->
+    <string name="action_settings">Settings</string>
+    <string name="action_login">Log In</string>
+    <string name="action_logout">Logout</string>
+    <!-- End MiniMenu strings -->
+    <!-- Start Reproductor strings -->
+    <string name="descriptionTxt">Description:</string>
+    <!-- Actions -->
+    <string name="subscribeBtn">Subscribe</string>
+    <string name="likeBtn">Like</string>
+    <string name="dislikeBtn">Dislike</string>
+    <string name="shareBtn">Share</string>
+    <string name="reportBtn">Report</string>
+    <string name="unSubscribeBtn">Unsubscribe</string>
+    <!-- Messages -->
+    <string name="subscribeMsg">You are subscribed to this channel</string>
+    <string name="rateMsg">You are rated the video</string>
+    <string name="unSubscribeMsg">You are unsubscribed to this channel</string>
+    <!-- End Reproductor strings -->
+    <!-- Start Settings strings -->
+    <string name="title_activity_settings">Settings</string>
+    <!-- Example General settings -->
+    <string name="pref_header_general">General</string>
+    <string name="pref_nfsw_title">NFSW content</string>
+    <string name="pref_nfsw_description">If is active may show the adult and sensitive content.</string>
+    <string name="pref_hostname_title">Peertube instance</string>
+    <string name="pref_hostname_error" translatable="false">-</string>
+    <string name="pref_message_exit">Restart app to apply changes</string>
+    <!-- End Settings strings -->
 
 </resources>
diff --git a/build.gradle b/build.gradle
index ea5d34b..ea89d91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong