Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/values-es/strings.xml

app/src/main/res/values-es/strings.xml

@@ -555,18 +555,18 @@
     <string name="removed_from_favorites">Eliminado de favoritos</string>
     <string name="lang_filipino">Filipino</string>
     <string name="action_bar_transparent_background">Fondo transparente</string>
-    <string name="pinfo_type">Info type</string>
+    <string name="pinfo_type">Estilo de Información</string>
     <string name="pinfo_album_and_artist_name">Nombre del álbum y del artista</string>
-    <string name="show_player_top_actions_bar">Show top actions bar</string>
-    <string name="icon_like_button">Like button</string>
-    <string name="icon_like_apple">Apple</string>
-    <string name="icon_like_breaked">Breaked</string>
-    <string name="icon_like_gift">Gift</string>
-    <string name="icon_like_shape">Shape</string>
-    <string name="icon_like_striped">Striped</string>
-    <string name="icon_like_brilliant">Brilliant</string>
-    <string name="player_swap_controls_with_timeline">Swap controls with timeline</string>
-    <string name="player_enable_lyrics_popup_message">Enable lyrics popup message</string>
+    <string name="show_player_top_actions_bar">Mostrar barra superior de acciones</string>
+    <string name="icon_like_button">Botón \"Me gusta\"</string>
+    <string name="icon_like_apple">Manzana</string>
+    <string name="icon_like_breaked">Roto</string>
+    <string name="icon_like_gift">Regalo</string>
+    <string name="icon_like_shape">Contorno</string>
+    <string name="icon_like_striped">Rayado</string>
+    <string name="icon_like_brilliant">Brillante</string>
+    <string name="player_swap_controls_with_timeline">Intercambiar controles con la línea de tiempo</string>
+    <string name="player_enable_lyrics_popup_message">Activar mensaje emergente de letras</string>
     <string name="exclude_songs_with_duration_limit">Exclude songs with duration limit</string>
     <string name="exclude_songs_with_duration_limit_description">If enabled, songs with duration over the limit will be excluded, applied to mytop and playback queue</string>
     <string name="no_log_available">No log available</string>