diff --git a/.travis.yml b/.travis.yml
index 1df6e7b6..74b79b85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,9 @@ env:
     - TASK="lintDebug"
     - TASK="build check --stacktrace"
 
+branches:
+  except:
+  - l10n_master
 notifications:
   webhooks:
     urls:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae162538..8cd034ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,17 @@
-# v0.1.5 (WIP)
+# v0.2.0 (WIP)
+
+# v0.1.5
 - Update title depending on what the user is doing
 - New greenish color scheme
 - Replaced SwipeToRefresh functionality with refresh button
 - Fixed some layout bugs (toolbars)
-- New translations! (Japanese, Portuguese-Brazilian, Russian)
+- New translations! (Japanese, Portuguese-Brazilian, Russian, Espanol) Thanks translators!
 - Increased Min-API to 17 (Jelly Bean) to mitigate CVE-2012-6636
 - Updated icons to vector graphics
 - Improvements to new-message/new-notification counters
 - Click on profile picture now opens users profile
 - Disabled backup functionality to prevent attackers to steal login cookies
+- Rework settings
 - Allow slider customization
 - Show aspect name after selection
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1894b278..71824d42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,4 +3,4 @@ If you got any questions feel free to join our XMPP/Jabber conference at `diaspo
 Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
 
 We use Crowdin to translate Diaspora for Android. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
-If your desired language is not listed please contact the maintainers.  
+If your desired language is not listed please contact the maintainers/owner.  
diff --git a/README.md b/README.md
index 929ba269..dce5cb81 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ If you got any questions feel free to join our XMPP/Jabber conference at `diaspo
 Note that the main project members are mostly busy with their job/university/school and may not react or start coding immediately.
 
 We use Crowdin to translate Diaspora for Android. Join our project here:   <https://crowdin.com/project/diaspora-for-android/invite>  
-If your desired language is not listed please contact the maintainers.  
+If your desired language is not listed please contact the maintainers/owner.  
 
 ### License
 It's released under GNU GENERAL PUBLIC LICENSE (see [LICENCE](https://github.com/Diaspora-for-Android/diaspora-android/blob/master/LICENSE.md)).
diff --git a/TRANSLATORS.md b/TRANSLATORS.md
new file mode 100644
index 00000000..cd0c305c
--- /dev/null
+++ b/TRANSLATORS.md
@@ -0,0 +1,8 @@
+#aaaaaaa>> This file contains references to people who helped translating the app
+#aaaaaab>> Please send a message on crowdin, and you will get included in the next commit
+#aaaaaac>>
+#aaaaaad>> Schemes:
+#aaaaaae>>   Firstname Lastname (Link)
+#aaaaaaf>>   Firstname Lastname (E-Mail)
+#aaaaaag>>   Username (Link)
+#aaaaaah>>   Username (E-Mail)
diff --git a/app/build.gradle b/app/build.gradle
index 522bbecc..12df96f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.github.dfa.diaspora_android"
         minSdkVersion 17
         targetSdkVersion 24
-        versionCode 5
-        versionName "0.1.4"
+        versionCode 6
+        versionName "0.1.5"
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/values-es/strings-preferences.xml b/app/src/main/res/values-es/strings-preferences.xml
index 4ee85f4b..eed930b0 100644
--- a/app/src/main/res/values-es/strings-preferences.xml
+++ b/app/src/main/res/values-es/strings-preferences.xml
@@ -5,12 +5,40 @@
   <!-- Navigiation Slider -->
   <!-- PodProfile -->
   <!-- Category Titles -->
+  <string name="pref_cat__visuals">Aspecto</string>
+  <string name="pref_cat__network">Red</string>
+  <string name="pref_cat__pod_settings">Ajustes del Pod</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">Control deslizante de navegación</string>
+  <string name="pref_desc__sub_nav_slider">Múltiples opciones para el cajón de navegación</string>
+  <string name="pref_cat__visibility_nav_items">Elemento visibilidad</string>
   <!-- Font size -->
+  <string name="pref_title__font_size">Tamaño de letra</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
   <!-- Load images -->
+  <string name="pref_title__load_images">Cargar imágenes</string>
+  <string name="pref_desc__load_images">Desactivar la carga de de imágenes a datos móviles seguros</string>
   <!-- Proxy -->
+  <string name="pref_title__proxy_enabled">Activar Proxy</string>
+  <string name="pref_desc__proxy_enabled">El tráfico proxificado de Diaspora para evitar firewalls.\nPuede necesitar reiniciarse</string>
+  <string name="pref_title__proxy_host">Anfitrión</string>
+  <string name="pref_title__proxy_port">Puerto</string>
   <!-- Diaspora Settings -->
+  <string name="pref_title__personal_settings">Configuración personal</string>
+  <string name="pref_desc__personal_settings">Abre la configuración de tu cuenta de diaspora</string>
+  <string name="pref_title__manage_contacts">Contactos</string>
+  <string name="pref_desc__manage_contacts">Administrar tu lista de contactos</string>
+  <string name="pref_title__manage_tags">Administrar Etiquetas</string>
+  <string name="pref_desc__manage_tags">Agregar y eliminar la etiqueta que estas siguendo</string>
+  <string name="pref_title__change_account">Cambiar cuenta</string>
+  <string name="pref_desc__change_account">Borrar datos de la sesión local y cambiar a otro pod/cuenta de Diaspora</string>
+  <string name="pref_warning__change_account">Esto borrará todas las cookies y datos de la sesión. ¡Realmente deseas cambiar tu cuenta?</string>
+  <string name="pref_title__clear_cache">Limpiar caché</string>
+  <string name="pref_desc__clear_cache">Limpiar cache de WebView</string>
+  <string name="pref_desc__intellihide_toolbars">Ocultar barras de herramientas superior e inferior automáticamente mientras se desplaza</string>
+  <string name="pref_title__intellihide_toolbars">Barras de herramientas Intellihide</string>
+  <string name="pref_title__append_shared_via_app">Añadir compartido por aviso</string>
+  <string name="pref_desc__append_shared_via_app">Agregar una referencia a esta aplicación (\"compartida por&#8230;\") a los textos compartidos</string>
   <!-- Recently added - Please move to right section-->
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 751a94ee..f7fbf7a8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,11 +2,69 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- App - AppName specific -->
+  <string name="shared_by_diaspora_android">*[compartido vía #DiasporaForAndroid]*</string>
   <!-- Application -->
+  <string name="reload">Recargar</string>
+  <string name="new_notifications">Notificación sin leer. ¿Quieres leerla?</string>
   <!-- Common Words -->
+  <string name="settings">Configuración</string>
+  <string name="notifications">Notificaciones</string>
+  <string name="conversations">Conversaciones</string>
+  <string name="stream">Entrada</string>
+  <string name="profile">Perfíl</string>
+  <string name="aspects">Aspectos</string>
+  <string name="activities">Actividades</string>
+  <string name="liked">Me gusta</string>
+  <string name="commented">Comentarios</string>
+  <string name="mentions">Menciones</string>
+  <string name="public_">Público</string>
+  <string name="search">Búsqueda</string>
   <!-- Pod Activity -->
+  <string name="title_activity_pods">Seleccionar Pod</string>
+  <string name="filter_hint">Introduce el dominio del Pod</string>
+  <string name="confirm_url">Confirma la url del Pod</string>
+  <string name="podlist_source_note">Nota: La lista de Pods esta integrada por Pods seguros enlistados en https://podupti.me. Puedes ingresar en el campo de edición cualquier Pod no enlistado.</string>
+  <string name="valid_pod">Por favor, introduce un nombre de dominio válido</string>
+  <string name="podlist_error">Error: ¡No se pudo recuperar la lista de pods!</string>
+  <string name="no_internet">Lo sentimos, debe estar conectado a internet para continuar</string>
+  <string name="confirmation">Confirmación</string>
+  <string name="confirm_pod">¿Realmente desea usar\nhttps://%1$s\ncomo su Pod de Diaspora?</string>
+  <string name="confirm_exit">¿Desea salir?</string>
   <!-- Drawer, Menu, Toolbar, ContextMenu -->
+  <string name="nav_help_license">Acerca de la aplicación | Ayuda</string>
+  <string name="nav_followed_tags">Etiquetas seguidas</string>
+  <string name="nav_public_activities">Actividad pública</string>
+  <string name="nav_settings_view">Ajustes de la aplicación</string>
+  <string name="share__share_link_as_text">Compartir link como texto</string>
+  <string name="share__share_screenshot">Compartir captura de pantalla de la página web</string>
+  <string name="share__take_screenshot">Tomar captura de pantalla de la página web</string>
+  <string name="share__toast_saved_image_to_location">Guardar imagen en</string>
+  <string name="share__toast_screenshot">Guardar captura de pantalla como:</string>
+  <string name="share__toast_link_address_copied">Dirección del enlace copiada &#8230;</string>
+  <string name="new_post">Nueva Publicación</string>
+  <string name="action_go_to_top">Ir arriba</string>
+  <string name="action_search_by_tags_or_persons">Buscar por etiquetas o personas</string>
+  <string name="action_exit_app">Salir de la aplicación</string>
+  <string name="action_toggle_desktop_page">Cambiar vista de móvil/escritorio</string>
+  <string name="action_share_dotdotdot">Compartir&#8230;</string>
+  <string name="search_alert_tag">Por etiquetas</string>
+  <string name="search_alert_people">Por personas</string>
+  <string name="search_alert_bypeople_validate_needsomedata">Por favor añade un nombre</string>
+  <string name="context_menu_share_link">Compartir la dirección del enlace</string>
+  <string name="context_menu_save_image">Guardar imagen</string>
+  <string name="context_menu_share_image">Compartir imagen</string>
+  <string name="context_menu_open_external_browser">Abrir en un navegador externo&#8230;</string>
+  <string name="context_menu_copy_link">Copiar dirección al portapapeles</string>
   <!-- More from MainActivity -->
+  <string name="toast_set_proxy_failed">Advertencia: No se pudo establecer proxy de la red</string>
+  <string name="unable_to_load_image">No se pudo cargar la imagen</string>
+  <string name="all_tags">Todas las etiquetas</string>
   <!-- Permissions -->
+  <string name="permissions_screenshot">Debe conceder \"Permiso de Almacenamiento de Información\" para guardar capturas de pantalla. Después debe cerrar completamente la aplicación o reiniciar el teléfono. Si usted no permite el acceso al almacenamiento pero desea utilizar la función de captura de pantalla en un momento posterior, puede conceder el permiso más adelante. Por favor vaya a: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
+  <string name="permissions_image">Debe conceder \"Permiso de Almacenamiento de Información\" para guardar imagenes. Después, debe cerrar completamete la aplicación o reiniciar el teléfono. Si usted no permite el acceso de almacenamiento pero quiere guardar imagenes en otro momento, puede conceder el permiso más adelante. Por favor abrir: ajustes del sistema - aplicaciones - Diaspora. En la sección de permisos puede conceder el \"permiso de almacenamiento de escritura\".</string>
+  <string name="permission_denied">Permiso denegado.</string>
+  <string name="permission_granted_try_again">Permiso concedido. Por favor, inténtelo de nuevo.</string>
   <!-- License & help (large amount of text) -->
+  <string name="help_markdown__name">Formato Markdown</string>
+  <string name="help_license__name">Licencia</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings-preferences.xml b/app/src/main/res/values-fr/strings-preferences.xml
index 78816dd9..6f2cf80e 100644
--- a/app/src/main/res/values-fr/strings-preferences.xml
+++ b/app/src/main/res/values-fr/strings-preferences.xml
@@ -10,6 +10,9 @@
   <string name="pref_cat__pod_settings">Paramètres du pod</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">Barre de navigation</string>
+  <string name="pref_desc__sub_nav_slider">Paramètres multiples pour le panneau de navigation</string>
+  <string name="pref_cat__visibility_nav_items">Visibilité de l’élément</string>
   <!-- Font size -->
   <string name="pref_title__font_size">Taille de la police</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
diff --git a/app/src/main/res/values-ja/strings-preferences.xml b/app/src/main/res/values-ja/strings-preferences.xml
index 96c8ceec..7255ec88 100644
--- a/app/src/main/res/values-ja/strings-preferences.xml
+++ b/app/src/main/res/values-ja/strings-preferences.xml
@@ -10,6 +10,9 @@
   <string name="pref_cat__pod_settings">ポッドの設定</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">ナビゲーション スライダー</string>
+  <string name="pref_desc__sub_nav_slider">ナビゲーション引き出しの複数設定</string>
+  <string name="pref_cat__visibility_nav_items">アイテムの表示</string>
   <!-- Font size -->
   <string name="pref_title__font_size">フォントサイズ</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
diff --git a/app/src/main/res/values-pt-rBR/strings-preferences.xml b/app/src/main/res/values-pt-rBR/strings-preferences.xml
index 3a54d88e..7e31b060 100644
--- a/app/src/main/res/values-pt-rBR/strings-preferences.xml
+++ b/app/src/main/res/values-pt-rBR/strings-preferences.xml
@@ -10,6 +10,9 @@
   <string name="pref_cat__pod_settings">Configurações do Pod</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">Controle deslizante de navegação</string>
+  <string name="pref_desc__sub_nav_slider">Várias configurações para a gaveta de navegação</string>
+  <string name="pref_cat__visibility_nav_items">Visibilidade de item</string>
   <!-- Font size -->
   <string name="pref_title__font_size">Tamanho da fonte</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
diff --git a/app/src/main/res/values-ru/strings-preferences.xml b/app/src/main/res/values-ru/strings-preferences.xml
index 0eb1dde6..ca64705c 100644
--- a/app/src/main/res/values-ru/strings-preferences.xml
+++ b/app/src/main/res/values-ru/strings-preferences.xml
@@ -10,6 +10,9 @@
   <string name="pref_cat__pod_settings">Настройки пода</string>
   <!-- Visuals -->
   <!-- Navigiation Slider -->
+  <string name="pref_title__sub_nav_slider">Слайдер навигации</string>
+  <string name="pref_desc__sub_nav_slider">Несколько параметров для судоходства ящик</string>
+  <string name="pref_cat__visibility_nav_items">Видимость элемента</string>
   <!-- Font size -->
   <string name="pref_title__font_size">Размер шрифта</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->