diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8ac1ab40..05e5cfe2 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -248,4 +248,5 @@
     <string name="bug_report_uploading">يتم رفع المشكلة إلى GitHub</string>
     <string name="bug_report_failed">غير قادر علي إرسال تقرير</string>
     <string name="bug_report_failed_wrong_credentials">اسم مستخدم او كلمة مرور خاطئه</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 0089b44c..b8fe998b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Информацията за устройството бе копирана в системния буфер.</string>
     <string name="your_account_data_is_only_used_for_authentication">Информацията за вашият акаунт се използва само за логин.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Вие ще бъдете пренасочени към уебсайтът който следи за проблеми.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ad4db864..845b2dcf 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Hledat</string>
     <string name="action_play_next">Další skladba</string>
     <string name="action_play">Přehrát</string>
+    <string name="action_play_pause">Přehrát/Pozastavit</string>
+    <string name="action_previous">Předchozí</string>
+    <string name="action_next">Další</string>
     <string name="action_add_to_playing_queue">Přidat do fronty</string>
     <string name="action_remove_from_playing_queue">Odebrat z fronty</string>
     <string name="action_add_to_playlist">Přidat do playlistu...</string>
@@ -45,6 +48,7 @@
     <string name="year">Rok</string>
     <string name="track">Skladba</string>
     <string name="track_hint">"Stopa (2 pro stopu 2; 3004 pro stopu 4 na CD3)"</string>
+    <string name="lyrics">Text</string>
     <string name="album_or_artist_empty">Název alba nebo interpreta je prázdný.</string>
     <string name="saving_changes">Ukládání změn...</string>
     <string name="saving_to_file">Ukládání do souboru...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Obrázky</string>
     <string name="pref_header_lockscreen">Odemykací obrazovka</string>
     <string name="pref_title_navigation_bar">Barevné záhlaví</string>
+    <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
     <string name="pref_title_set_default_start_page">Zvolit výchozí obrazovku</string>
     <string name="pref_title_album_art_on_lockscreen">Obal alba na odemykací obrazovce</string>
     <string name="pref_title_auto_download_artist_images">Automaticky stahovat obrázky umělců</string>
@@ -129,6 +134,7 @@
     <string name="pref_title_alternative_progress_slider_now_playing">Alternativní ukazatel přehrávače</string>
     <string name="pref_title_playback_controller_card_now_playing">Zvýraznit tlačítka ovládání přehrávače</string>
     <string name="pref_title_colored_playback_controls_now_playing">Barevná ovládací tlaítka</string>
+    <string name="pref_title_audio_ducking">Snížit hlasitost při ztrátě priority zvuku</string>
     <string name="no_equalizer">"Nenalezen žádný ekvalizér. "</string>
     <string name="no_audio_ID">"Nejdříve přehrajte píseň, poté zkuste znovu. "</string>
     <string name="delete_action">Smazat</string>
@@ -153,6 +159,7 @@
     <string name="playlist_name_empty">Pojmenování seznamu skladeb</string>
     <string name="song">Skladba</string>
     <string name="pref_only_lollipop">"Dostupné pouze ve verzi Lollipop."</string>
+    <string name="pref_only_nougat_mr1">"Pouze od Android Nougat 7.1."</string>
     <string name="pref_summary_album_art_on_lockscreen">Obaly alb se budou zobrazovat na zamykací obrazovce. Pro aplikaci může být nutné aplikaci restartovat.</string>
     <string name="pref_summary_blurred_album_art">Rozostří obal alba na uzamčené obrazovce. Může být problematické s aplikacemi a widgety třetích stran.</string>
     <string name="pref_summary_colored_notification">"Notifikace jsou zbarveny podle obalu alba."</string>
@@ -166,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">"Může zvýšit kvalitu obalu alba, ale způsobí pomalejší načítání. Povolte pouze pokud máte problémy s nízkým rozlišením obalu. "</string>
     <string name="pref_summary_colored_playback_controls_now_playing">"Zabarv\u00ed tla\u010d\u00edtka p\u0159ehr\u00e1t/pozastavit, n\u00e1hodn\u011b a opakovat a tak\u00e9 ukazatel \u010dasu do barvy obalu. "</string>
     <string name="pref_summary_colored_navigation_bar">Zvolte, kde se má zobrazovat barevné záhlaví.</string>
+    <string name="pref_summary_colored_app_shortcuts">Zbarví zkratky aplikace primární barvou</string>
     <string name="pref_summary_audio_ducking">Oznámení, navigace atd.</string>
     <string name="could_not_download_album_cover">"Nelze st\u00e1hnout obal alba."</string>
     <string name="search_hint">Vyhledat zvukové soubory...</string>
@@ -181,8 +189,8 @@
     <string name="action_sleep_timer">Určit ukončení přehrávání</string>
     <string name="action_set">Nastavit</string>
     <string name="cancel_current_timer">Zrušit ukončení přehrávání</string>
-    <string name="sleep_timer_canceled">Ukončení přehrávání bylo zrušeno</string>
-    <string name="sleep_timer_set">Přehrávání se ukončí za %d minut</string>
+    <string name="sleep_timer_canceled">Ukončení přehrávání zrušeno.</string>
+    <string name="sleep_timer_set">Přehrávání se ukončí za %d minut.</string>
     <string name="action_new_playlist">Nový playlist...</string>
     <string name="new_playlist_title">Nový playlist</string>
     <string name="colored_footers">"Barevné zápatí "</string>
@@ -256,8 +264,17 @@
     <string name="bug_report_uploading">Nahrávání hlášení na GitHub...</string>
     <string name="bug_report_failed">Nelze poslat hlášení</string>
     <string name="bug_report_failed_wrong_credentials">Nesprávné uživatelské jméno nebo heslo</string>
+    <string name="bug_report_failed_invalid_token">Nesprávný přístupový kód. Kontaktujte vývojáře aplikace.</string>
+    <string name="bug_report_failed_issues_not_available">Není povoleno v daném adresáři. Kontaktujte vývojáře aplikace.</string>
     <string name="bug_report_failed_unknown">Vyskytla se neočekávaná chyba. Kontaktujte vývojáře aplikace.</string>
     <string name="copied_device_info_to_clipboard">Informace o zařízení zkopírovány do schránky.</string>
     <string name="your_account_data_is_only_used_for_authentication">Vaše údaje k účtu jsou použity pouze k ověření.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Budete přesměrováni na webovou stránku pro zadání problému.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">Náhodně všechny skladby</string>
+    <string name="app_shortcut_shuffle_all_short">Náhodně</string>
+    <string name="app_shortcut_top_tracks_long">Nejposlouchanější Skladby</string>
+    <string name="app_shortcut_top_tracks_short">Nejposlouchanější Skladby</string>
+    <string name="app_shortcut_last_added_long">Posledně přidané</string>
+    <string name="app_shortcut_last_added_short">Posledně přidané</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 381f15db..f05954dc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Suche</string>
     <string name="action_play_next">Spiele als nächstes</string>
     <string name="action_play">Abspielen</string>
+    <string name="action_play_pause">Play/Pause</string>
+    <string name="action_previous">Vorheriger</string>
+    <string name="action_next">Nächster</string>
     <string name="action_add_to_playing_queue">Zur Warteschlange hinzufügen</string>
     <string name="action_remove_from_playing_queue">Von Warteschlange entfernen</string>
     <string name="action_add_to_playlist">Zu Wiedergabeliste hinzufügen…</string>
@@ -45,6 +48,7 @@
     <string name="year">Jahr</string>
     <string name="track">Titel</string>
     <string name="track_hint">"Track (2 für Track 2 oder 3004 für CD 3 Track 4)"</string>
+    <string name="lyrics">Songtext</string>
     <string name="album_or_artist_empty">Der Titel oder der Interpret ist leer.</string>
     <string name="saving_changes">Speichere Änderungen…</string>
     <string name="saving_to_file">In Datei speichern...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Bilder</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
     <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
+    <string name="pref_title_app_shortcuts">Gefärbte App-Shortcuts</string>
     <string name="pref_title_set_default_start_page">Startseite</string>
     <string name="pref_title_album_art_on_lockscreen">Album Cover anzeigen</string>
     <string name="pref_title_auto_download_artist_images">Interpreten Bilder automatisch herunterladen</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Wiedergabelisten Name</string>
     <string name="song">Titel</string>
     <string name="pref_only_lollipop">"Nur auf Android Lollipop 5.x verfügbar"</string>
+    <string name="pref_only_nougat_mr1">"Nur verfügbar für Nougat 7.1"</string>
     <string name="pref_summary_album_art_on_lockscreen">Das Album Cover des aktuellen Titels wird als Hintergrund im Sperrbildschirm verwendet.</string>
     <string name="pref_summary_blurred_album_art">Lässt das Album Cover auf dem Sperrbildschirm verschwommen aussehen. Kann Probleme mit Apps und Widgets von Dritten verursachen.</string>
     <string name="pref_summary_colored_notification">"Die Benachrichtigung ist in der Farbe des Album Covers gef\u00e4rbt."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Kann die Album Cover Qualität verbessern was jedoch die Ladezeit beeinträchtigt. Nur aktivieren falls Probleme mit niedrig aufgelösten Album Covern auftreten.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Der Play/Pause, Shuffle und Repeat Schalter sowie der Progress Slider sind in der Farbe des Album Covers gef\u00e4rbt.</string>
     <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste mit der Hauptfarbe.</string>
+    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Shortcuts mit der Hauptfarbe</string>
     <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation etc.</string>
     <string name="could_not_download_album_cover">"Es konnte kein passendes Album Cover heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
@@ -263,4 +270,11 @@
     <string name="copied_device_info_to_clipboard">Geräteinformation wurde in die Zwischenablage kopiert.</string>
     <string name="your_account_data_is_only_used_for_authentication">Deine Konto Daten werden ausschließlich zur Authentifizierung genutzt.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Du wirst zur Issue Tracker Webseite weitergeleitet.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Zufällig</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Lieblingstitel</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 90cb661b..646e4285 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -264,4 +264,5 @@
     <string name="copied_device_info_to_clipboard">Αντιγράφτηκαν οι πληροφορίες συσκευής στο πρόχειρο.</string>
     <string name="your_account_data_is_only_used_for_authentication">Τα στοιχεία του λογαριασμού σας χρησιμοποιούνται μόνο για τον έλεγχο της ταυτότητάς σας.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Θα μεταφερθείτε στην ιστοσελίδα του εντοπιστή ζητημάτων.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index dc971057..d9f834ec 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
     <string name="currently_listening_to_x_by_x">Estás escuchando %1$s por %2$s.</string>
-    <string name="the_audio_file">W</string>
+    <string name="the_audio_file">El archivo de audio</string>
     <string name="do_you_want_to_set_x_as_ringtone">¿Te gustaría establecer %1$s como tono de llamada?</string>
     <string name="x_has_been_set_as_ringtone">"Establecer %1$s como tono de llamada "</string>
     <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
@@ -20,6 +20,9 @@
     <string name="action_search">Buscar</string>
     <string name="action_play_next">Reproducir a Continuación</string>
     <string name="action_play">Reproducir</string>
+    <string name="action_play_pause">Reproducir / Pausar</string>
+    <string name="action_previous">Anterior</string>
+    <string name="action_next">Siguiente</string>
     <string name="action_add_to_playing_queue">Añadir a cola de reproducción</string>
     <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
     <string name="action_add_to_playlist">Añadir a la lista de reproducción...</string>
@@ -45,7 +48,8 @@
     <string name="year">Año</string>
     <string name="track">Pista</string>
     <string name="track_hint">"Pista (2 para pista 2 o 3004 para CD3 pista 4)"</string>
-    <string name="album_or_artist_empty">El título o artista está vacío.</string>
+    <string name="lyrics">Letras</string>
+    <string name="album_or_artist_empty">El título o artista está vacío</string>
     <string name="saving_changes">Guardando cambios...</string>
     <string name="saving_to_file">Guardando en el archivo...</string>
     <string name="label_details">Detalles</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
+    <string name="pref_title_app_shortcuts">Atajos coloreados de la aplicación</string>
     <string name="pref_title_set_default_start_page">Página de inicio</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
     <string name="pref_title_auto_download_artist_images">Descargar automaticamente las fotos de los artistas</string>
@@ -167,6 +172,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la carátula del álbum pero causa que las imágenes carguen mas lento. Sólo activalo si tienes problemas con carátulas de baja resolución.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Colorea los botones de reproducir/pausar, aleatorio y repetir as\u00ed como la barra de progreso con el color vibrante de la car\u00e1tula del \u00e1lbum.</string>
     <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación con el color principal.</string>
+    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos con el color principal</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación etc.</string>
     <string name="could_not_download_album_cover">"No se puede descargar una car\u00e1tula de \u00e1lbum que coincida."</string>
     <string name="search_hint">Buscar en la biblioteca...</string>
@@ -262,5 +268,8 @@
     <string name="bug_report_failed_unknown">Un error inesperado ha ocurrido. Por favor, contacte con el desarrollador</string>
     <string name="copied_device_info_to_clipboard">Información del dispositivo copiada al portapapeles</string>
     <string name="your_account_data_is_only_used_for_authentication">La información de tu cuenta se usa solamente para la autenticación</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Será redirigido a la página web del rastreador de problemas.</string>
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Será redirigido a la página web del buscador de problemas.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Mezclar</string>
+    <string name="app_shortcut_top_tracks_short">Los mejores temas</string>
 </resources>
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 134816c7..77d6c869 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Buscar</string>
     <string name="action_play_next">Siguiente</string>
     <string name="action_play">Reproducir</string>
+    <string name="action_play_pause">Reproducir/Pausar</string>
+    <string name="action_previous">Anterior</string>
+    <string name="action_next">Siguiente</string>
     <string name="action_add_to_playing_queue">Agregar a la cola de reproducción</string>
     <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
     <string name="action_add_to_playlist">Agregar a la lista de reproducción...</string>
@@ -45,9 +48,10 @@
     <string name="year">Año</string>
     <string name="track">Pista</string>
     <string name="track_hint">"Pista (2 para pista 2 o 3004 para CD3 pista 4)"</string>
+    <string name="lyrics">Letras</string>
     <string name="album_or_artist_empty">El título o artista está vacío.</string>
     <string name="saving_changes">Guardando cambios...</string>
-    <string name="saving_to_file">Guardar en archivo...</string>
+    <string name="saving_to_file">Guardando al archivo...</string>
     <string name="label_details">Detalles</string>
     <string name="label_file_name">Nombre del archivo</string>
     <string name="label_file_path">Ubicación del archivo</string>
@@ -55,7 +59,7 @@
     <string name="label_file_format">Formato</string>
     <string name="label_track_length">Duración</string>
     <string name="label_bit_rate">Tasa de bits</string>
-    <string name="label_sampling_rate">Frecuencia de la muestra</string>
+    <string name="label_sampling_rate">Frecuencia de muestreo</string>
     <string name="action_go_to_artist">Ir al artista</string>
     <string name="action_go_to_album">Ir al álbum</string>
     <string name="label_playing_queue">Cola de reproducción</string>
@@ -102,19 +106,20 @@
     <string name="last_opened">Última abierta</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Oscuro</string>
-    <string name="black_theme_name">Negro</string>
+    <string name="black_theme_name">Negro (AMOLED)</string>
     <string name="always">Siempre</string>
-    <string name="only_on_wifi">Sólo en WiFi</string>
+    <string name="only_on_wifi">Sólo en Wi-Fi</string>
     <string name="never">Nunca</string>
     <string name="equalizer">Ecualizador</string>
     <string name="pref_header_colors">Colores</string>
-    <string name="pref_header_now_playing_screen">Reproducción Actual</string>
+    <string name="pref_header_now_playing_screen">Reproduciendo ahora</string>
     <string name="pref_title_general_theme">Tema general</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">General</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
+    <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
     <string name="pref_title_set_default_start_page">Sección de inicio</string>
     <string name="pref_title_album_art_on_lockscreen">Mostrar carátula del álbum</string>
     <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
@@ -142,7 +147,7 @@
     <string name="default_str">Por defecto</string>
     <string name="primary_color">Color principal</string>
     <string name="accent_color">Color de énfasis</string>
-    <string name="primary_color_desc">El color principal, indigo por defecto.</string>
+    <string name="primary_color_desc">El color principal, índigo por defecto.</string>
     <string name="accent_color_desc">El color de énfasis, rosa por defecto.</string>
     <string name="update_image">Actualizar imagen</string>
     <string name="playlist_empty_text">Lista de reproducción vacía</string>
@@ -154,19 +159,21 @@
     <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
     <string name="song">Canción</string>
     <string name="pref_only_lollipop">"Sólo disponible en Lollipop."</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo</string>
+    <string name="pref_only_nougat_mr1">"Sólo disponible en Nougat 7.1."</string>
+    <string name="pref_summary_album_art_on_lockscreen">Utiliza la carátula del álbum que se reproduce como fondo de pantalla de bloqueo.</string>
     <string name="pref_summary_blurred_album_art">Desenfoca la carátula del álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones de terceros y widgets.</string>
     <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n con el color vibrante de la car\u00e1tula del \u00e1lbum."</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas durante la reproducción en algunos dispositivos."</string>
-    <string name="pref_summary_force_square_album_art">La carátula en la pantalla reproducción siempre sera cuadrado</string>
+    <string name="pref_summary_force_square_album_art">La carátula en la pantalla de reproducción siempre será cuadrada.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">Colorea la barra de herramientas.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">Colorea la barra de estado.</string>
-    <string name="pref_summary_larger_title_box_now_playing">La caja de título en Reproduciendo es más grande.</string>
+    <string name="pref_summary_larger_title_box_now_playing">La caja de título en es más grande.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra de progreso que no cubre la carátula del álbum en lugar de la barra de progreso por defecto.</string>
-    <string name="pref_summary_playback_controller_card_now_playing">Muestra una tarjeta detrás de los botones reproducir/pausar, siguiente, previo, aleatorio y repetir.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Muestra una tarjeta detrás de los botones reproducir/pausar, adelantar, regresar, aleatorio y repetir.</string>
     <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la carátula del álbum pero a veces puede tardar en cargar. Sólo actívalo si tienes problemas con carátulas de baja resolución.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Colorea los botones de reproducir/pausar, aleatorio y repetir as\u00ed como la barra de progreso con el color vibrante de la car\u00e1tula del \u00e1lbum.</string>
     <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación con el color principal.</string>
+    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos con el color principal.</string>
     <string name="pref_summary_audio_ducking">Notificaciones, navegación, etc.</string>
     <string name="could_not_download_album_cover">"No se puede descargar una car\u00e1tula de \u00e1lbum coincidente."</string>
     <string name="search_hint">Buscar en la biblioteca...</string>
@@ -223,15 +230,15 @@
     <string name="up_next">En seguida</string>
     <string name="pref_title_now_playing_screen_appearance">Apariencia</string>
     <string name="intro_label">Introducción</string>
-    <string name="press_back_again_to_exit_intro">Presione de nuevo para salir del intro</string>
-    <string name="welcome_to_phonograph">"Bienvenido a Phonograho, un reproductor de música hermoso y ligero para Android."</string>
+    <string name="press_back_again_to_exit_intro">Presione regresar de nuevo para omitir el intro.</string>
+    <string name="welcome_to_phonograph">"Bienvenido a Phonograph, un reproductor de música hermoso y ligero para Android."</string>
     <string name="open_playing_queue_instruction">Desliza la tarjeta en la pantalla de Reproducción Actual para desplegar la cola de reproducción completa.</string>
     <string name="rearrange_playing_queue_instruction">Reorganiza la cola de reproducción arrastrando una canción desde su número de pista.</string>
     <string name="library">Biblioteca</string>
     <string name="folders">Carpetas</string>
     <string name="saved_playlist_to">Lista de reproducción guardada en %s.</string>
     <string name="failed_to_save_playlist">No se pudo guardar lista de reproducción (%s).</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no se encuentra listado en los medios almacenados]]></string>
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no se encuentra listado en los medios almacenados.]]></string>
     <string name="nothing_to_scan">Nada para escanear.</string>
     <string name="scanned_files">%1$d de %2$d archivos escaneados.</string>
     <string name="could_not_scan_files">No se pudieron escanear los archivos %d.</string>
@@ -263,4 +270,11 @@
     <string name="copied_device_info_to_clipboard">Información de dispositivo copiado al portapapeles.</string>
     <string name="your_account_data_is_only_used_for_authentication">Sus datos de cuenta sólo se utilizan para la autenticación.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Se remitirá a la Página Web de seguimiento del tema.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Al azar</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Los mejores temas</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 0440df42..d1c3b78f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Kopioitiin laitteen tiedot leikepöydälle.</string>
     <string name="your_account_data_is_only_used_for_authentication">Sinun käyttäjätietojasi käytetään vain todentamiseen.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Sinut johdatetaan vianseurantaohjelman verkkosivulle.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8443ff3c..f13fd242 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Rechercher</string>
     <string name="action_play_next">Jouer ensuite</string>
     <string name="action_play">Lecture</string>
+    <string name="action_play_pause">Play/Pause</string>
+    <string name="action_previous">Précédent</string>
+    <string name="action_next">Suivant</string>
     <string name="action_add_to_playing_queue">Ajouter à la liste de lecture</string>
     <string name="action_remove_from_playing_queue">Retirer de la liste de lecture</string>
     <string name="action_add_to_playlist">Ajouter à la liste de lecture...</string>
@@ -45,6 +48,7 @@
     <string name="year">Année</string>
     <string name="track">Piste</string>
     <string name="track_hint">"Piste (2 pour piste 2 ou 3004 pour CD3 piste 4)"</string>
+    <string name="lyrics">Paroles</string>
     <string name="album_or_artist_empty">Le champ \"titre\" ou \"artiste\" est vide.</string>
     <string name="saving_changes">Sauvegarde des modifications</string>
     <string name="saving_to_file">Sauvegarde dans le fichier…</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Images</string>
     <string name="pref_header_lockscreen">Écran de verrouillage</string>
     <string name="pref_title_navigation_bar">Barre de navigation colorée</string>
+    <string name="pref_title_app_shortcuts">Raccourcis de l\'application colorés</string>
     <string name="pref_title_set_default_start_page">Page d\'accueil</string>
     <string name="pref_title_album_art_on_lockscreen">Afficher la pochette d\'album</string>
     <string name="pref_title_auto_download_artist_images">Télécharger automatiquement les images</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Nom de la liste de lecture</string>
     <string name="song">Titre</string>
     <string name="pref_only_lollipop">"Disponible sur Lollipop uniquement."</string>
+    <string name="pref_only_nougat_mr1">"Disponible uniquement sous Android Nougat 7.1."</string>
     <string name="pref_summary_album_art_on_lockscreen">La pochette d\'album du titre actuel est utilisée comme fond d\'écran de verrouillage.</string>
     <string name="pref_summary_blurred_album_art">Floute la pochette d\'album sur l\'écran de verrouillage. Peut causer des problèmes avec des applications et des widgets tiers.</string>
     <string name="pref_summary_colored_notification">"Colore la notification en fonction de la pochette de l'album."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Peut augmenter la qualité des pochettes d\'albums, mais peut causer des temps de chargement plus longs. N\'activez cette option que si vous avez des problèmes de basse résolution des pochettes.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Colore les contr\u00f4les de lecture (boutons Lecture/Pause, Lecture Al\u00e9atoire et R\u00e9p\u00e9ter) ainsi que la barre de progression en fonction de la pochette de l\'album.</string>
     <string name="pref_summary_colored_navigation_bar">Colore la barre de navigation en fonction de la couleur principale.</string>
+    <string name="pref_summary_colored_app_shortcuts">Colore les raccourcis de l\'application selon la couleur primaire.</string>
     <string name="pref_summary_audio_ducking">Notifications, navigation, etc.</string>
     <string name="could_not_download_album_cover">"Impossible de t\u00e9l\u00e9charger la pochette correspondant \u00e0 l'album."</string>
     <string name="search_hint">Recherche dans votre bibliothèque...</string>
@@ -263,4 +270,11 @@
     <string name="copied_device_info_to_clipboard">Informations sur l\'appareil copiées dans le presse-papiers.</string>
     <string name="your_account_data_is_only_used_for_authentication">Vos données de compte sont utilisées pour l\'authentification uniquement.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vous serez redirigé vers le site internet du traqueur de problèmes.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Lecture aléatoire</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Meilleurs titres</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 00e41491..2cf98310 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -190,4 +190,5 @@
     <string name="password">סיסמא</string>
     <string name="bug_report_uploading">מעלה דיווח לGitHub…</string>
     <string name="bug_report_failed_wrong_credentials">שם משתמש או סיסמא שגויים</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f9e277fa..94ce16e3 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Informacije o uređaju su kopirane u međuspremnik.</string>
     <string name="your_account_data_is_only_used_for_authentication">Podatci vašeg računa su korišteni samo za autentikaciju.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Biti ćete preusmjereni na web-stranicu pratitelja za poteškoće.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index def449c0..4d3865f4 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Keresés</string>
     <string name="action_play_next">Lejátszás következőnek</string>
     <string name="action_play">Lejátszás</string>
+    <string name="action_play_pause">Lejátszás/Szünet</string>
+    <string name="action_previous">Előző</string>
+    <string name="action_next">Következő</string>
     <string name="action_add_to_playing_queue">Hozzáadás a lejátszási sorhoz</string>
     <string name="action_remove_from_playing_queue">Eltávolítás a lejátszási sorból</string>
     <string name="action_add_to_playlist">Hozzáadás a lejátszási listához...</string>
@@ -45,6 +48,7 @@
     <string name="year">Év</string>
     <string name="track">Zeneszám</string>
     <string name="track_hint">"Dal sorszáma az albumban"</string>
+    <string name="lyrics">Dalszöveg</string>
     <string name="album_or_artist_empty">A cím vagy az előadó üres.</string>
     <string name="saving_changes">Változások mentése</string>
     <string name="saving_to_file">Mentés fájlba ...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Képek</string>
     <string name="pref_header_lockscreen">Zárképernyő</string>
     <string name="pref_title_navigation_bar">Színezett navigációs sáv</string>
+    <string name="pref_title_app_shortcuts">Színes alkalmazás hivatkozások</string>
     <string name="pref_title_set_default_start_page">Kezdő oldal</string>
     <string name="pref_title_album_art_on_lockscreen">Albumboritó megjelenítése</string>
     <string name="pref_title_auto_download_artist_images">Előadó képének automatikus letöltése</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Lejátszási lista neve</string>
     <string name="song">Dal</string>
     <string name="pref_only_lollipop">"Ez az opció Android 5.0-tól (Lollipop) érhető el."</string>
+    <string name="pref_only_nougat_mr1">"Csak Android 7.1. Nougat-tól elérhető"</string>
     <string name="pref_summary_album_art_on_lockscreen">Jelenlegi dal albumborítójának használata a zárképernyő háttérképeként.</string>
     <string name="pref_summary_blurred_album_art">Albumborító elhomályosítása a zárképernyőn.Ez problémákat okozhat a harmadik féltől származó alkalmazásoknál és widgeteknél.</string>
     <string name="pref_summary_colored_notification">"\u00c9rtes\u00edt\u00e9sek sz\u00ednez\u00e9se az albumbor\u00edt\u00f3 sz\u00edn\u00e9vel."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Növelheti az album borító minőségét, de lassabban tölti be a képeket. Csak akkor engedélyezze, ha az albumborítók rossz minőségben jelennek meg.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Lej\u00e1tsz\u00e1s/sz\u00fcnet, kever\u00e9s \u00e9s ism\u00e9tl\u00e9s gombok sz\u00ednez\u00e9se, bele\u00e9rtve a halad\u00e1si cs\u00faszk\u00e1t is, az albumbor\u00edt\u00f3 sz\u00edn\u00e9vel.</string>
     <string name="pref_summary_colored_navigation_bar">Navigációs sáv színezése az alapértelmezett színnel.</string>
+    <string name="pref_summary_colored_app_shortcuts">Az alkalmazás hivatkozások színezése az elsődleges szín szerint.</string>
     <string name="pref_summary_audio_ducking">Beérkező értesítéskor a lejátszás hangereje lecsökken, majd az értesítés végén visszaáll az eredeti hangerőre.</string>
     <string name="could_not_download_album_cover">"Nem siker\u00fclt let\u00f6lteni a megfelel\u0151 albumbor\u00edt\u00f3t."</string>
     <string name="search_hint">Keresés a könyvtáradban...</string>
@@ -263,4 +270,7 @@
     <string name="copied_device_info_to_clipboard">Az eszköz információ a vágólapra másolva.</string>
     <string name="your_account_data_is_only_used_for_authentication">Fiókod adatait kizárólag hitelesítéshez fogjuk használni.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Továbbítani fogunk a problémakezelő oldalra.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Keverés</string>
+    <string name="app_shortcut_top_tracks_short">Top Dalok</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 06719609..0e5274e9 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Info perangkat tersalin ke papan klip</string>
     <string name="your_account_data_is_only_used_for_authentication">Data akun Anda hanya digunakan untuk otentikasi.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan ditersukan ke situs web pelacak masalah.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 06719609..0e5274e9 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Info perangkat tersalin ke papan klip</string>
     <string name="your_account_data_is_only_used_for_authentication">Data akun Anda hanya digunakan untuk otentikasi.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan ditersukan ke situs web pelacak masalah.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9e6b3c4a..95de0371 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Cerca</string>
     <string name="action_play_next">Riproduci successivo</string>
     <string name="action_play">Riproduci</string>
+    <string name="action_play_pause">Play/Pausa</string>
+    <string name="action_previous">Precedente</string>
+    <string name="action_next">Prossima</string>
     <string name="action_add_to_playing_queue">Aggiungi alla coda di riproduzione</string>
     <string name="action_remove_from_playing_queue">Rimuovi dalla coda di riproduzione</string>
     <string name="action_add_to_playlist">Aggiungi alla playlist...</string>
@@ -45,6 +48,7 @@
     <string name="year">Anno</string>
     <string name="track">Traccia</string>
     <string name="track_hint">"Traccia (2 per traccia 2, o 3004 per CD3 traccia 4)"</string>
+    <string name="lyrics">Testi</string>
     <string name="album_or_artist_empty">Il titolo o l\'artista sono vuoti.</string>
     <string name="saving_changes">Salvataggio modifiche in corso...</string>
     <string name="saving_to_file">Salvataggio in corso...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Immagini</string>
     <string name="pref_header_lockscreen">Schermata di blocco</string>
     <string name="pref_title_navigation_bar">Barra di navigazione colorata</string>
+    <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
     <string name="pref_title_set_default_start_page">Pagina iniziale</string>
     <string name="pref_title_album_art_on_lockscreen">Mostra copertina album nella schermata di blocco</string>
     <string name="pref_title_auto_download_artist_images">Scarica automaticamente le immagini degli artisti</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Nome playlist</string>
     <string name="song">Brano</string>
     <string name="pref_only_lollipop">"Disponibile solo su Lollipop."</string>
+    <string name="pref_only_nougat_mr1">"Disponibile solo su Nougat 7.1"</string>
     <string name="pref_summary_album_art_on_lockscreen">Usa la copertina dell\'album in riproduzione come sfondo della schermata di blocco.</string>
     <string name="pref_summary_blurred_album_art">Applica una sfocatura sulla copertina nella schermata di blocco. Può causare problemi con app e widget di terze parti.</string>
     <string name="pref_summary_colored_notification">"La notifica \u00e8 colorata secondo la gamma di colori della copertina."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Può incrementare la qualità delle copertine, ma causa rallentamenti nei tempi di caricamento delle immagini. Abilita soltanto se hai problemi con copertine a bassa risoluzione.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Colora i pulsanti play/pausa, casuale e ripeti cos\u00ec come la barra d\'avanzamento secondo la gamma di colori della copertina.</string>
     <string name="pref_summary_colored_navigation_bar">Colora la barra di navigazione del colore principale.</string>
+    <string name="pref_summary_colored_app_shortcuts">Colora le scorciatoie dell\'app con il colore principale.</string>
     <string name="pref_summary_audio_ducking">Notifiche, navigazione ecc.</string>
     <string name="could_not_download_album_cover">"Impossibile scaricare una copertina adatta."</string>
     <string name="search_hint">Cercando nella tua libreria...</string>
@@ -264,4 +271,11 @@
     <string name="copied_device_info_to_clipboard">Informazioni dispositivo copiate negli appunti.</string>
     <string name="your_account_data_is_only_used_for_authentication">I tuoi dati account sono usati solo per l\'autenticazione.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Verrai indirizzato al sito di bugtracking.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@stringa/azione_casuale_tutto</string>
+    <string name="app_shortcut_shuffle_all_short">Casuale</string>
+    <string name="app_shortcut_top_tracks_long">@stringa/mie_migliori_tracce</string>
+    <string name="app_shortcut_top_tracks_short">Migliodi Tracce</string>
+    <string name="app_shortcut_last_added_long">@stringa/ultima_aggiunta</string>
+    <string name="app_shortcut_last_added_short">@stringa/ultima_aggiunta</string>
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 00e41491..2cf98310 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -190,4 +190,5 @@
     <string name="password">סיסמא</string>
     <string name="bug_report_uploading">מעלה דיווח לGitHub…</string>
     <string name="bug_report_failed_wrong_credentials">שם משתמש או סיסמא שגויים</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6acb332d..92fcf380 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -198,4 +198,5 @@
     <string name="bug_report_manual">手動で送信</string>
     <string name="username">ユーザー名</string>
     <string name="password">パスワード</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 3793727a..7d5819c2 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -193,4 +193,5 @@
     <string name="intro_label">소개</string>
     <string name="welcome_to_phonograph">"Android를 위한 아름답고 가벼운 음악 플레이어인 Phonograph에 오신 것을 환영합니다."</string>
     <string name="folders">폴더</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index ad0fc0ac..69af3765 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Zoeken</string>
     <string name="action_play_next">Afspelen als volgende</string>
     <string name="action_play">Afspelen</string>
+    <string name="action_play_pause">Afspelen/Pauzeren</string>
+    <string name="action_previous">Vorige</string>
+    <string name="action_next">Volgende</string>
     <string name="action_add_to_playing_queue">Toevoegen aan afspeelwachtrij</string>
     <string name="action_remove_from_playing_queue">Verwijderen uit afspeelwachtrij</string>
     <string name="action_add_to_playlist">Toevoegen aan afspeellijst…</string>
@@ -45,6 +48,7 @@
     <string name="year">Jaar</string>
     <string name="track">Nummer</string>
     <string name="track_hint">"Nummer (2 voor nr. 2, of 3004 voor CD3 nr. 4)"</string>
+    <string name="lyrics">Songteksten</string>
     <string name="album_or_artist_empty">De titel of artiest is leeg.</string>
     <string name="saving_changes">Wijzigingen opslaan</string>
     <string name="saving_to_file">Opslaan in bestand…</string>
@@ -263,4 +267,5 @@
     <string name="copied_device_info_to_clipboard">Apparaat info gekopieerd naar klembord.</string>
     <string name="your_account_data_is_only_used_for_authentication">Je accountgegevens worden alleen gebruikt voor authenticatie.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Je wordt doorverwezen naar de probleem bijhoud website.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 46802aa5..6b48dad1 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -91,4 +91,5 @@
     <string name="search_hint">Søk i biblioteket...</string>
     <string name="rescanning_media">Skanner media på nytt...</string>
     <string name="new_playlist_title">Ny speleliste</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ade46cae..911c5bc1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">Kopiowanie informacji o urządzeniu do schowka</string>
     <string name="your_account_data_is_only_used_for_authentication">Twoje dane konta używane są tylko do uwierzytelniania</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Zostaniesz przekierowany do strony umożliwiającej śledzenie błędów</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a55a17b1..1d96a0ca 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -263,4 +263,5 @@
     <string name="copied_device_info_to_clipboard">As informações do aparelho foram copiadas para a área de transferência.</string>
     <string name="your_account_data_is_only_used_for_authentication">Os dados de sua conta são usados apenas para autenticação.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Você será encaminhado ao nosso site de registro de erros.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 669ffea5..baa07cfc 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -258,4 +258,5 @@
     <string name="bug_report_failed_unknown">Ocorreu um erro inesperado. Por favor contacte o desenvolvedor da aplicação.</string>
     <string name="your_account_data_is_only_used_for_authentication">A sua informação da conta é apenas usada para a autenticação.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vai ser reencaminhado para o site do rastreador de problemas.</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 53328641..4ca06a61 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -133,4 +133,5 @@
     <string name="cancel_current_timer">Anulează timer curent.</string>
     <string name="action_new_playlist">Lista de redare nouă...</string>
     <string name="new_playlist_title">Listă de redare nouă</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 813dc188..aa51342a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Поиск</string>
     <string name="action_play_next">Воспроизвести следующую</string>
     <string name="action_play">Воспроизведение</string>
+    <string name="action_play_pause">Воспроизведение/Пауза</string>
+    <string name="action_previous">Предыдущий</string>
+    <string name="action_next">Следующий</string>
     <string name="action_add_to_playing_queue">Добавить в очередь воспроизведения</string>
     <string name="action_remove_from_playing_queue">Удалить из очереди воспроизведения</string>
     <string name="action_add_to_playlist">Добавить в плейлист...</string>
@@ -45,8 +48,9 @@
     <string name="year">Год</string>
     <string name="track">Трек</string>
     <string name="track_hint">"Трек (2 для трека 2 или 3004 для трека 4 CD3)"</string>
+    <string name="lyrics">Текст песни</string>
     <string name="album_or_artist_empty">Поля названия альбома или альбом исполнителя пусты</string>
-    <string name="saving_changes">Сохранение изменений...</string>
+    <string name="saving_changes">Сохранение изменений</string>
     <string name="saving_to_file">Сохраняем файл...</string>
     <string name="label_details">Подробнее</string>
     <string name="label_file_name">Имя файла</string>
@@ -115,8 +119,9 @@
     <string name="pref_header_images">Изображения</string>
     <string name="pref_header_lockscreen">Экран блокировки</string>
     <string name="pref_title_navigation_bar">Цветная панель управления</string>
+    <string name="pref_title_app_shortcuts">Цветные шорткаты</string>
     <string name="pref_title_set_default_start_page">Установить начальную страницу</string>
-    <string name="pref_title_album_art_on_lockscreen">Обложка альбома на экране блокировки</string>
+    <string name="pref_title_album_art_on_lockscreen">Показывать обложку альбома</string>
     <string name="pref_title_auto_download_artist_images">Автоматически загружать изображения исполнителей</string>
     <string name="pref_title_blurred_album_art">"Размытая обложка альбома "</string>
     <string name="pref_title_colored_notification">Окрашенное уведомление</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Имя плейлиста</string>
     <string name="song">Песня</string>
     <string name="pref_only_lollipop">"Доступно только для Lollipop."</string>
+    <string name="pref_only_nougat_mr1">"Доступно только для Nougat 7.1"</string>
     <string name="pref_summary_album_art_on_lockscreen">Обложка альбома текущей песни используется как изображение экрана блокировки.</string>
     <string name="pref_summary_blurred_album_art">Делает размытую обложку фоном экрана блокировки. Может создавать проблемы с другими приложениями и виджетами.</string>
     <string name="pref_summary_colored_notification">"\u041e\u043a\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u0442 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0432 \u0442\u043e\u043d \u043e\u0431\u043b\u043e\u0436\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Может увеличить качество обложки, но также увеличивает время их отрисовки. Влючайте только, если вы имеете проблемы с низким разрешением обложек альбомов.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">\u041e\u043a\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u0442 \u043a\u043d\u043e\u043f\u043a\u0438 \u043f\u0443\u0441\u043a/\u043f\u0430\u0443\u0437\u0430, \u043f\u0435\u0440\u0435\u043c\u0435\u0448\u0430\u0442\u044c \u0438 \u043f\u043e\u0432\u0442\u043e\u0440, \u0430 \u0442\u0430\u043a \u0436\u0435 \u0441\u043b\u0430\u0439\u0434\u0435\u0440 \u043f\u043e\u0437\u0438\u0446\u0438\u0438 \u0432 \u0442\u043e\u043d \u043e\u0431\u043b\u043e\u0436\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430.</string>
     <string name="pref_summary_colored_navigation_bar">Окрашивает панель навигации в основной цвет.</string>
+    <string name="pref_summary_colored_app_shortcuts">Окрашивает шорткаты в основной цвет.</string>
     <string name="pref_summary_audio_ducking">Уведомления, навигация, т.д.</string>
     <string name="could_not_download_album_cover">"\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043f\u043e\u0434\u0445\u043e\u0434\u044f\u0449\u0443\u044e \u043e\u0431\u043b\u043e\u0436\u043a\u0443 \u0430\u043b\u044c\u0431\u043e\u043c\u0430."</string>
     <string name="search_hint">Поиск библиотеки...</string>
@@ -263,4 +270,7 @@
     <string name="copied_device_info_to_clipboard">Информация об устройстве скопирована в буфер обмена.</string>
     <string name="your_account_data_is_only_used_for_authentication">Информация о вашем аккаунте используется только для авторизации.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Вы будете перенаправлены на сайт для отчётов об ошибках.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Перемешать</string>
+    <string name="app_shortcut_top_tracks_short">Популярные треки</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3adc3e17..c68fbaec 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -103,4 +103,5 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="search_hint">Sök i ditt bibliotek ...</string>
     <string name="rescanning_media">Återskannar media ...</string>
     <string name="new_playlist_title">Ny spellista</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index ae5bd534..fae35676 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Ara</string>
     <string name="action_play_next">Sonraki şarkı</string>
     <string name="action_play">Oynat</string>
+    <string name="action_play_pause">Oynat/Durdur</string>
+    <string name="action_previous">Önceki</string>
+    <string name="action_next">Sonraki</string>
     <string name="action_add_to_playing_queue">Çalma sırasına ekle</string>
     <string name="action_remove_from_playing_queue">Kuyruktan çıkar</string>
     <string name="action_add_to_playlist">Çalma listesine ekle...</string>
@@ -45,6 +48,7 @@
     <string name="year">Yıl</string>
     <string name="track">Şarkı</string>
     <string name="track_hint">"Parça (2. parça için 2 ya da CD3 4. parça için 3004)"</string>
+    <string name="lyrics">Şarkı sözleri</string>
     <string name="album_or_artist_empty">Albüm başlığı veya albüm sanatçısı bilgisi yok.</string>
     <string name="saving_changes">Değişiklikler kaydediliyor</string>
     <string name="saving_to_file">Dosyaya kaydediliyor...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Görüntüler</string>
     <string name="pref_header_lockscreen">Kilit ekranı</string>
     <string name="pref_title_navigation_bar">Renkli gezinti çubuğu</string>
+    <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
     <string name="pref_title_set_default_start_page">Başlangıç sayfası</string>
     <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
     <string name="pref_title_auto_download_artist_images">Sanatçı resimlerini otomatik indir</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Çalma listesi adı</string>
     <string name="song">Şarkı</string>
     <string name="pref_only_lollipop">"Sadece Lollipop için."</string>
+    <string name="pref_only_nougat_mr1">"Sadece Nugat 7.1.'de kullanılabilir."</string>
     <string name="pref_summary_album_art_on_lockscreen">Kilit ekranı duvar kağıdı olarak çalan şarkının albüm kapağını kullanır.</string>
     <string name="pref_summary_blurred_album_art">Kilit ekranındaki bulanık albüm kapağı. 3. parti uygulama ve araçlarda problem oluşturabilir.</string>
     <string name="pref_summary_colored_notification">"Bildirimler alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 renkleriyle renklendirilir."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Albüm kapağı kalitesinin artırılması daha yavaş görüntü yükleme sürelerine neden olabilir. Düşük çözünürlükte olan albüm kapakları ile ilgili sorunlar varsa bunu etkinleştirin.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">Oynat/durdur, kar\u0131\u015ft\u0131r ve tekrar tu\u015flar\u0131n\u0131n yan\u0131 s\u0131ra ilerleme kayd\u0131r\u0131c\u0131 alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 rengi ile renklendirilir.</string>
     <string name="pref_summary_colored_navigation_bar">Gezinme çubuğu renkleri birincil renkler içinden.</string>
+    <string name="pref_summary_colored_app_shortcuts">Uygulama kısayollarını ana rengi renklendirir</string>
     <string name="pref_summary_audio_ducking">Bildirimler, gezinti vb.</string>
     <string name="could_not_download_album_cover">"E\u015flenen bir alb\u00fcm kapa\u011f\u0131 indirilemedi."</string>
     <string name="search_hint">Kütüphaneniz taranıyor...</string>
@@ -224,7 +231,7 @@
     <string name="pref_title_now_playing_screen_appearance">Görünüm</string>
     <string name="intro_label">Tanıtım</string>
     <string name="press_back_again_to_exit_intro">Tanıtımı atlamak için geri tuşuna basın.</string>
-    <string name="welcome_to_phonograph">"Phonograph'a Hoşgeldiniz, Android için güzel ve hafif bir müzik çalar. "</string>
+    <string name="welcome_to_phonograph">"Phonograph'a Hoşgeldiniz, Android için muhteşem bir müzik çalar. "</string>
     <string name="open_playing_queue_instruction">Şuan çalınıyor ekranı kartını yukarı kaydırmak çalma sırasının tamamını ortaya çıkarır.</string>
     <string name="rearrange_playing_queue_instruction">Çalma sırasını yeniden düzenlemek için şarkının parça numarasını kaydırın</string>
     <string name="library">Kütüphane</string>
@@ -263,4 +270,11 @@
     <string name="copied_device_info_to_clipboard">Cihaz bilgisi panoya kopyalandı.</string>
     <string name="your_account_data_is_only_used_for_authentication">Hesabınız ile ilgili veriler yalnızca kimlik doğrulaması için kullanılır.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Sorununuz sorun takip web sitesine iletilir.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Karıştır</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">En İyi Parçalar</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 8f404625..0c0a840f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -239,4 +239,5 @@
     <string name="app_widget_big_name">Phonograph - Великий</string>
     <string name="app_widget_classic_name">Phonograph - Класичний</string>
     <string name="app_widget_small_name">Phonograph - Малий</string>
+    <!-- App Shortcuts -->
 </resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 56b2eec2..4a126c92 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">Tìm kiếm</string>
     <string name="action_play_next">Phát kế tiếp</string>
     <string name="action_play">Phát</string>
+    <string name="action_play_pause">Phát/Dừng</string>
+    <string name="action_previous">Trước</string>
+    <string name="action_next">Kế tiếp</string>
     <string name="action_add_to_playing_queue">Thêm vào danh sách phát</string>
     <string name="action_remove_from_playing_queue">Xoá khỏi danh sách phát</string>
     <string name="action_add_to_playlist">Thêm vào danh sách nhạc...</string>
@@ -45,6 +48,7 @@
     <string name="year">Năm</string>
     <string name="track">Ca khúc</string>
     <string name="track_hint">"Số thứ tự (ghi 2 nếu là bài thứ 2 hoặc ghi 3004 nếu là CD 3, bài thứ 4)"</string>
+    <string name="lyrics">Lời bài hát</string>
     <string name="album_or_artist_empty">Tiêu đề hoặc nghệ sĩ rỗng.</string>
     <string name="saving_changes">Đang lưu thay đổi</string>
     <string name="saving_to_file">Đang lưu tập tin...</string>
@@ -115,6 +119,7 @@
     <string name="pref_header_images">Hình ảnh</string>
     <string name="pref_header_lockscreen">Màn hình khóa</string>
     <string name="pref_title_navigation_bar">Màu thanh điều hướng</string>
+    <string name="pref_title_app_shortcuts">Màu sắc biểu tượng ứng dụng</string>
     <string name="pref_title_set_default_start_page">Trang bắt đầu</string>
     <string name="pref_title_album_art_on_lockscreen">Hiện bìa album</string>
     <string name="pref_title_auto_download_artist_images">Tự động tải về hình ảnh nghệ sĩ</string>
@@ -154,6 +159,7 @@
     <string name="playlist_name_empty">Tên danh sách nhạc</string>
     <string name="song">Bài hát</string>
     <string name="pref_only_lollipop">"Chỉ có trên Lollipop."</string>
+    <string name="pref_only_nougat_mr1">"Chỉ có trên Nougat 7.1."</string>
     <string name="pref_summary_album_art_on_lockscreen">Sử dụng bìa album các bài hát hiện tại làm hình nền màn hình khóa.</string>
     <string name="pref_summary_blurred_album_art">Làm mờ bìa album trên màn hình khóa. Có thể gây ra vấn đề với các ứng dụng của bên thứ ba và các tiện ích (widget).</string>
     <string name="pref_summary_colored_notification">"M\u00e0u s\u1eafc r\u1ef1c r\u1ee1 cho c\u00e1c th\u00f4ng b\u00e1o trong b\u00eca album."</string>
@@ -167,6 +173,7 @@
     <string name="pref_summary_ignore_media_store_artwork">Có thể làm tăng chất lượng bìa album nhưng làm chậm quá trình tải hình ảnh. Chỉ cho phép điều này nếu bạn có vấn đề với hình ảnh có độ phân giải thấp.</string>
     <string name="pref_summary_colored_playback_controls_now_playing">M\u00e0u s\u1eafc c\u1ee7a ph\u00e1t / t\u1ea1m d\u1eebng, tr\u1ed9n v\u00e0 l\u1eb7p l\u1ea1i c\u0169ng nh\u01b0 thanh ti\u1ebfn tr\u00ecnh trong m\u00e0u s\u1eafc r\u1ef1c r\u1ee1 c\u1ee7a b\u00eca album.</string>
     <string name="pref_summary_colored_navigation_bar">Màu sắc thanh điều hướng trong các màu cơ bản.</string>
+    <string name="pref_summary_colored_app_shortcuts">Màu sắc chủ đạo của biểu tượng ứng dụng.</string>
     <string name="pref_summary_audio_ducking">Thông báo, điều hướng, vv.</string>
     <string name="could_not_download_album_cover">"Kh\u00f4ng th\u1ec3 t\u1ea3i v\u1ec1 b\u00eca album ph\u00f9 h\u1ee3p."</string>
     <string name="search_hint">Tìm kiếm thư viện của bạn...</string>
@@ -263,4 +270,11 @@
     <string name="copied_device_info_to_clipboard">Đã sao chép thông tin thiết bị vào bảng nhớ tạm (Clipboard).</string>
     <string name="your_account_data_is_only_used_for_authentication">Thông tin tài khoản của bạn chỉ dùng để chứng thực.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Bạn sẽ được đưa đến trang web theo dõi vấn đề.</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Xáo trộn</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Bài hát hàng đầu</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4ce5a3a2..e1f629cb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -25,7 +25,7 @@
     <string name="action_next">下一首</string>
     <string name="action_add_to_playing_queue">加入播放队列</string>
     <string name="action_remove_from_playing_queue">从播放队列中移除</string>
-    <string name="action_add_to_playlist">加入播放列表</string>
+    <string name="action_add_to_playlist">加入播放列表...</string>
     <string name="action_tag_editor">音乐标签编辑器</string>
     <string name="action_delete_from_device">从设备中删除</string>
     <string name="action_details">详情</string>
@@ -37,8 +37,8 @@
     <string name="artists">艺术家</string>
     <string name="songs">歌曲</string>
     <string name="playlists">播放列表</string>
-    <string name="unplayable_file">\u65e0\u6cd5\u64ad\u653e\u8be5\u66f2\u76ee</string>
-    <string name="biography_unavailable">\u627e\u4e0d\u5230\u8be5\u827a\u672f\u5bb6\u7684\u4e2a\u4eba\u4fe1\u606f</string>
+    <string name="unplayable_file">\u65e0\u6cd5\u64ad\u653e\u8be5\u6b4c\u66f2\u3002</string>
+    <string name="biography_unavailable">\u627e\u4e0d\u5230\u8be5\u827a\u672f\u5bb6\u7684\u4e2a\u4eba\u4fe1\u606f\u3002</string>
     <string name="biography">歌手简介</string>
     <string name="audio_focus_denied">无法获取音频焦点。</string>
     <string name="album">专辑</string>
@@ -49,8 +49,8 @@
     <string name="track">音轨</string>
     <string name="track_hint">"音轨（如用 2 表示第 2 首歌或用 3004 表示 CD3 里的第 4 首歌）"</string>
     <string name="lyrics">歌词</string>
-    <string name="album_or_artist_empty">标题或艺术家名称为空</string>
-    <string name="saving_changes">正在保存更改…</string>
+    <string name="album_or_artist_empty">标题或艺术家名称为空。</string>
+    <string name="saving_changes">正在保存更改</string>
     <string name="saving_to_file">保存至文件...</string>
     <string name="label_details">详情</string>
     <string name="label_file_name">文件名</string>
@@ -66,64 +66,65 @@
     <string name="save_as_playlist">保存为播放列表</string>
     <string name="no_results">没有找到结果</string>
     <string name="action_re_download_artist_image">更新艺术家图片</string>
-    <string name="updated_artist_image">艺术家图片已更新</string>
-    <string name="could_not_update_artist_image">\u65e0\u6cd5\u66f4\u65b0\u827a\u672f\u5bb6\u56fe\u7247</string>
+    <string name="updated_artist_image">艺术家图片已更新。</string>
+    <string name="could_not_update_artist_image">\u65e0\u6cd5\u66f4\u65b0\u827a\u672f\u5bb6\u56fe\u7247\u3002</string>
     <string name="updating">正在更新…</string>
-    <string name="added_title_to_playing_queue">"该曲目已加入播放队列"</string>
-    <string name="added_x_titles_to_playing_queue">%1$d 首曲目已加入播放队列</string>
+    <string name="added_title_to_playing_queue">"此歌曲已加入播放队列。"</string>
+    <string name="added_x_titles_to_playing_queue">%1$d 首歌曲已加入播放队列。</string>
     <string name="action_remove_from_playlist">从播放列表中移除</string>
     <string name="action_grid_size">网格尺寸</string>
     <string name="action_grid_size_land">网格尺寸（横屏）</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d 首曲目已加入到播放列表 %2$s</string>
-    <string name="created_playlist_x">播放列表 %1$s 已创建</string>
-    <string name="deleted_playlist_x">播放列表 %1$s 已删除</string>
-    <string name="deleted_x_songs">%1$d 首曲目已删除</string>
-    <string name="could_not_create_playlist">\u65e0\u6cd5\u521b\u5efa\u64ad\u653e\u5217\u8868</string>
-    <string name="delete_playlist_x"><![CDATA[删除播放列表 <b>%1$s</b>？]]></string>
-    <string name="clear_playlist_x"><![CDATA[\u6e05\u7a7a\u64ad\u653e\u5217\u8868 <b>%1$s</b> \u4e2d\u7684\u6240\u6709\u66f2\u76ee\u5417\uff1f\u8be5\u64cd\u4f5c\u5c06\u65e0\u6cd5\u64a4\u9500\uff01]]></string>
-    <string name="delete_x_playlists"><![CDATA[删除 <b>%1$d</b> 个播放列表？]]></string>
-    <string name="delete_song_x"><![CDATA[删除曲目 <b>%1$s</b> ？]]></string>
-    <string name="delete_x_songs"><![CDATA[删除 <b>%1$d</b> 首曲目？]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[从当前播放列表中移除 <b>%1$s</b> ？]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[从播放列表中移除 <b>%1$d</b> 首曲目？]]></string>
-    <string name="delete_song_title">删除曲目</string>
-    <string name="delete_songs_title">删除多首曲目</string>
-    <string name="remove_song_from_playlist_title">从播放列表中移除曲目</string>
-    <string name="remove_songs_from_playlist_title">从播放列表中移除多首曲目</string>
+    <string name="inserted_x_songs_into_playlist_x">%1$d 首歌曲已加入到播放列表 %2$s。</string>
+    <string name="created_playlist_x">播放列表 %1$s 已创建。</string>
+    <string name="deleted_playlist_x">播放列表 %1$s 已删除。</string>
+    <string name="deleted_x_songs">%1$d 首歌曲已删除。</string>
+    <string name="could_not_create_playlist">\u65e0\u6cd5\u521b\u5efa\u64ad\u653e\u5217\u8868\u3002</string>
+    <string name="delete_playlist_x"><![CDATA[是否删除播放列表 <b>%1$s</b>？]]></string>
+    <string name="clear_playlist_x"><![CDATA[\u662f\u5426\u6e05\u7a7a\u64ad\u653e\u5217\u8868 <b>%1$s</b>\uff1f\u6b64\u64cd\u4f5c\u65e0\u6cd5\u64a4\u9500\uff01]]></string>
+    <string name="delete_x_playlists"><![CDATA[是否删除 <b>%1$d</b> 个播放列表？]]></string>
+    <string name="delete_song_x"><![CDATA[是否删除歌曲 <b>%1$s</b>？]]></string>
+    <string name="delete_x_songs"><![CDATA[是否删除 <b>%1$d</b> 首歌曲？]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[是否从播放列表中移除 <b>%1$s</b>？]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[是否从播放列表中移除 <b>%1$d</b> 首歌曲？]]></string>
+    <string name="delete_song_title">删除歌曲</string>
+    <string name="delete_songs_title">删除多首歌曲</string>
+    <string name="remove_song_from_playlist_title">从播放列表中移除歌曲</string>
+    <string name="remove_songs_from_playlist_title">从播放列表中移除多首歌曲</string>
     <string name="rename_playlist_title">重命名播放列表</string>
     <string name="delete_playlist_title">删除播放列表</string>
     <string name="delete_playlists_title">删除多个播放列表</string>
     <string name="clear_playlist_title">清空播放列表</string>
     <string name="save_playlist_title">另存为</string>
     <string name="add_playlist_title">"添加到播放列表"</string>
-    <string name="action_shuffle_all">随机播放所有曲目</string>
-    <string name="action_shuffle_album">随机播放该专辑</string>
-    <string name="action_shuffle_artist">随机播放该艺术家</string>
-    <string name="action_shuffle_playlist">随机播放该播放列表</string>
+    <string name="action_shuffle_all">随机播放所有歌曲</string>
+    <string name="action_shuffle_album">随机播放此专辑</string>
+    <string name="action_shuffle_artist">随机播放此艺术家</string>
+    <string name="action_shuffle_playlist">随机播放此播放列表</string>
     <string name="action_clear_playing_queue">清空播放队列</string>
     <string name="action_go_to_start_directory">跳转至起始目录</string>
     <string name="action_show_lyrics">显示歌词</string>
     <string name="last_opened">最后打开时的页面</string>
-    <string name="light_theme_name">亮色</string>
+    <string name="light_theme_name">浅色</string>
     <string name="dark_theme_name">暗色</string>
-    <string name="black_theme_name">黑色 (AMOLED)</string>
+    <string name="black_theme_name">黑色（AMOLED）</string>
     <string name="always">总是</string>
     <string name="only_on_wifi">仅在 WiFi 下</string>
     <string name="never">从不</string>
     <string name="equalizer">均衡器</string>
-    <string name="pref_header_colors">色彩</string>
+    <string name="pref_header_colors">颜色</string>
     <string name="pref_header_now_playing_screen">正在播放界面</string>
     <string name="pref_title_general_theme">全局主题</string>
     <string name="pref_header_audio">声音</string>
     <string name="pref_header_general">常规</string>
     <string name="pref_header_images">图片</string>
     <string name="pref_header_lockscreen">锁屏</string>
-    <string name="pref_title_navigation_bar">变色导航栏</string>
+    <string name="pref_title_navigation_bar">着色导航栏</string>
+    <string name="pref_title_app_shortcuts">着色应用快捷方式</string>
     <string name="pref_title_set_default_start_page">起始页</string>
     <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
     <string name="pref_title_auto_download_artist_images">自动下载艺术家图像</string>
     <string name="pref_title_blurred_album_art">专辑封面模糊化</string>
-    <string name="pref_title_colored_notification">启用变色通知背景</string>
+    <string name="pref_title_colored_notification">启用通知背景着色</string>
     <string name="pref_title_ignore_media_store_artwork">忽略媒体储存中的专辑封面</string>
     <string name="pref_title_gapless_playback">无缝播放</string>
     <string name="pref_title_force_square_album_art">方形专辑封面</string>
@@ -132,10 +133,10 @@
     <string name="pref_title_larger_title_box_now_playing">大号标题框</string>
     <string name="pref_title_alternative_progress_slider_now_playing">备选进度条样式</string>
     <string name="pref_title_playback_controller_card_now_playing">启用卡片式播放控制面板</string>
-    <string name="pref_title_colored_playback_controls_now_playing">启用播放控制面板变色</string>
+    <string name="pref_title_colored_playback_controls_now_playing">启用播放控制面板着色</string>
     <string name="pref_title_audio_ducking">音频焦点丢失时降低音量</string>
-    <string name="no_equalizer">没有找到均衡器</string>
-    <string name="no_audio_ID">"请在播放曲目后再次尝试该操作"</string>
+    <string name="no_equalizer">没有找到均衡器。</string>
+    <string name="no_audio_ID">"请在播放歌曲后再次尝试此操作。"</string>
     <string name="delete_action">删除</string>
     <string name="clear_action">清空</string>
     <string name="remove_action">移除</string>
@@ -146,39 +147,41 @@
     <string name="default_str">默认</string>
     <string name="primary_color">主色调</string>
     <string name="accent_color">强调色</string>
-    <string name="primary_color_desc">主题主色调，默认为靛蓝色</string>
-    <string name="accent_color_desc">主题强调色，默认为粉色</string>
+    <string name="primary_color_desc">主题主色调，默认为靛蓝色。</string>
+    <string name="accent_color_desc">主题强调色，默认为粉色。</string>
     <string name="update_image">更新图片</string>
     <string name="playlist_empty_text">播放列表为空</string>
     <string name="no_playlists">没有播放列表</string>
     <string name="no_albums">没有专辑</string>
-    <string name="no_songs">没有曲目</string>
+    <string name="no_songs">没有歌曲</string>
     <string name="no_artists">没有艺术家</string>
     <string name="empty">空</string>
     <string name="playlist_name_empty">播放列表名称</string>
     <string name="song">歌曲</string>
-    <string name="pref_only_lollipop">"仅适用于 Lollipop"</string>
+    <string name="pref_only_lollipop">"仅适用于 Lollipop。"</string>
+    <string name="pref_only_nougat_mr1">"仅适用于 Nougat 7.1。"</string>
     <string name="pref_summary_album_art_on_lockscreen">使用当前播放曲目的专辑封面作为锁屏壁纸。</string>
-    <string name="pref_summary_blurred_album_art">模糊化显示锁屏界面内的专辑封面。该功能或与第三方应用及桌面插件产生冲突。</string>
-    <string name="pref_summary_colored_notification">"\u4f7f\u7528\u4e0e\u4e13\u8f91\u5c01\u9762\u76f8\u5339\u914d\u7684\u989c\u8272\u4f5c\u4e3a\u901a\u77e5\u80cc\u666f\u8272\u3002"</string>
+    <string name="pref_summary_blurred_album_art">模糊化显示锁屏界面内的专辑封面。此功能或与第三方应用及桌面插件产生冲突。</string>
+    <string name="pref_summary_colored_notification">"\u4f7f\u7528\u4e0e\u4e13\u8f91\u5c01\u9762\u76f8\u5339\u914d\u7684\u989c\u8272\u7740\u8272\u901a\u77e5\u80cc\u666f\u8272\u3002"</string>
     <string name="pref_summary_gapless_playback">"在某些设备上会造成播放问题。"</string>
     <string name="pref_summary_force_square_album_art">在正在播放界面中总是显示方形的专辑封面。</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">为工具栏上色</string>
-    <string name="pref_summary_opaque_statusbar_now_playing">为状态栏上色</string>
-    <string name="pref_summary_larger_title_box_now_playing">提高曲目标题框高度</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">着色工具栏。</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">着色状态栏。</string>
+    <string name="pref_summary_larger_title_box_now_playing">提高歌曲标题框高度。</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">使用不会遮挡专辑封面的进度条来替换默认的进度条滑块。</string>
-    <string name="pref_summary_playback_controller_card_now_playing">在播放/暂停，上一首/下一首，随机播放和循环按钮下方显示卡片式背景。</string>
+    <string name="pref_summary_playback_controller_card_now_playing">在播放/暂停、上一首/下一首、随机播放和循环按钮下方显示卡片式背景。</string>
     <string name="pref_summary_ignore_media_store_artwork">可以提高专辑封面图片的质量但加载时间也会更长。仅当遇到专辑封面像素过低时建议开启。</string>
-    <string name="pref_summary_colored_playback_controls_now_playing">\u64ad\u653e/\u6682\u505c\u3001\u968f\u673a\u64ad\u653e\u3001\u5faa\u73af\u64ad\u653e\u6309\u952e\u4ee5\u53ca\u6b4c\u66f2\u8fdb\u5ea6\u6761\u7684\u989c\u8272\u90fd\u5c06\u6839\u636e\u4e13\u8f91\u5c01\u9762\u8272\u8fdb\u884c\u53d8\u8272\u3002</string>
-    <string name="pref_summary_colored_navigation_bar">导航栏颜色与主色调保持一致。</string>
-    <string name="pref_summary_audio_ducking">如通知，导航等</string>
+    <string name="pref_summary_colored_playback_controls_now_playing">\u64ad\u653e/\u6682\u505c\u3001\u968f\u673a\u64ad\u653e\u3001\u5faa\u73af\u64ad\u653e\u6309\u952e\u4ee5\u53ca\u6b4c\u66f2\u8fdb\u5ea6\u6761\u7684\u989c\u8272\u90fd\u5c06\u6839\u636e\u4e13\u8f91\u5c01\u9762\u8272\u8fdb\u884c\u7740\u8272\u3002</string>
+    <string name="pref_summary_colored_navigation_bar">用主色调着色导航栏。</string>
+    <string name="pref_summary_colored_app_shortcuts">用主色调着色应用快捷方式。</string>
+    <string name="pref_summary_audio_ducking">通知、导航等</string>
     <string name="could_not_download_album_cover">"\u65e0\u6cd5\u4e0b\u8f7d\u5230\u5339\u914d\u7684\u4e13\u8f91\u5c01\u9762\u3002"</string>
     <string name="search_hint">正在扫描</string>
     <string name="rescanning_media">正在重新扫描媒体储存…</string>
     <string name="favorites">收藏夹</string>
     <string name="last_added">最近添加</string>
     <string name="history">播放历史</string>
-    <string name="my_top_tracks">最喜爱的曲目</string>
+    <string name="my_top_tracks">最喜爱的歌曲</string>
     <string name="remove_cover">移除专辑封面</string>
     <string name="download_from_last_fm">从 Last.fm 上下载</string>
     <string name="pick_from_local_storage">从本地储存中选取</string>
@@ -186,11 +189,11 @@
     <string name="action_sleep_timer">睡眠定时器</string>
     <string name="action_set">设置</string>
     <string name="cancel_current_timer">取消当前定时器</string>
-    <string name="sleep_timer_canceled">定时器已取消</string>
-    <string name="sleep_timer_set">音乐将在 %d 分钟后停止播放</string>
+    <string name="sleep_timer_canceled">定时器已取消。</string>
+    <string name="sleep_timer_set">音乐将在 %d 分钟后停止播放。</string>
     <string name="action_new_playlist">新建播放列表…</string>
     <string name="new_playlist_title">新建播放列表</string>
-    <string name="colored_footers">变色页脚</string>
+    <string name="colored_footers">着色页脚</string>
     <string name="special_thanks_to">特别鸣谢</string>
     <string name="changelog">更新日志</string>
     <string name="licenses">许可信息</string>
@@ -214,7 +217,7 @@
     <string name="join_community_summary">如果您需要帮助或遇到问题，Google+ 上的 Phonograph 社群或许是个好去处。</string>
     <string name="translate">翻译</string>
     <string name="translate_summary">帮助翻译 Phonograph 。</string>
-    <string name="rate_on_google_play">评价</string>
+    <string name="rate_on_google_play">评分</string>
     <string name="rate_on_google_play_summary">如果喜欢 Phonograph 请在 Play Store 中留下您的好评。</string>
     <string name="donate">捐赠</string>
     <string name="donate_summary">如果您喜欢我的作品，也可以在这里来选择捐赠我。</string>
@@ -230,14 +233,14 @@
     <string name="press_back_again_to_exit_intro">再次点击后退键可跳过介绍页。</string>
     <string name="welcome_to_phonograph">"欢迎使用 Phonohraph ，这是一款精致且简洁的 Android 音乐播放器。 "</string>
     <string name="open_playing_queue_instruction">上滑正在播放界面内的卡片即可展开播放队列。</string>
-    <string name="rearrange_playing_queue_instruction">通过拖动曲目名前面的序列号来调整播放队列的顺序。</string>
-    <string name="library">曲库</string>
+    <string name="rearrange_playing_queue_instruction">通过拖动歌曲名前面的序列号来调整播放队列的顺序。</string>
+    <string name="library">媒体库</string>
     <string name="folders">文件夹</string>
-    <string name="saved_playlist_to">保存播放列表至 %s</string>
-    <string name="failed_to_save_playlist">保存播放列表 (%s) 失败</string>
+    <string name="saved_playlist_to">已保存播放列表到 %s。</string>
+    <string name="failed_to_save_playlist">保存播放列表（%s）失败。</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> 没有列在媒体储存中。]]></string>
     <string name="nothing_to_scan">没有可扫描的对象。</string>
-    <string name="scanned_files">已扫描 %1$d / %2$d 个文件。</string>
+    <string name="scanned_files">已扫描 %1$d/%2$d 个文件。</string>
     <string name="could_not_scan_files">%d 个文件无法扫描。</string>
     <string name="listing_files">正在列举文件</string>
     <string name="new_start_directory">%s 是新的初始目录。</string>
@@ -261,10 +264,17 @@
     <string name="bug_report_uploading">正在将报告上传至 Github...</string>
     <string name="bug_report_failed">无法发送报告</string>
     <string name="bug_report_failed_wrong_credentials">错误的用户名或密码</string>
-    <string name="bug_report_failed_invalid_token">无效的访问令牌。请联系应用开发者</string>
-    <string name="bug_report_failed_issues_not_available">所选的资源库中未启用错误报告。请联系应用开发者</string>
-    <string name="bug_report_failed_unknown">发生了一个意外错误。请联系应用开发者</string>
-    <string name="copied_device_info_to_clipboard">设备信息已复制到剪贴板</string>
-    <string name="your_account_data_is_only_used_for_authentication">您的帐号信息仅用于身份认证</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">将带您跳转至报告问题的网站</string>
+    <string name="bug_report_failed_invalid_token">无效的访问令牌。请联系应用开发者。</string>
+    <string name="bug_report_failed_issues_not_available">所选的资源库中未启用错误报告。请联系应用开发者。</string>
+    <string name="bug_report_failed_unknown">发生了一个意外错误。请联系应用开发者。</string>
+    <string name="copied_device_info_to_clipboard">设备信息已复制到剪贴板。</string>
+    <string name="your_account_data_is_only_used_for_authentication">您的帐号信息仅用于身份认证。</string>
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">将带您跳转至报告问题的网站。</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">随机播放</string>
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">最喜欢的歌曲</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 797fce83..a3696098 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -20,6 +20,9 @@
     <string name="action_search">搜尋</string>
     <string name="action_play_next">下一首播放</string>
     <string name="action_play">播放</string>
+    <string name="action_play_pause">播放/暫停</string>
+    <string name="action_previous">上一首</string>
+    <string name="action_next">下一首</string>
     <string name="action_add_to_playing_queue">加入播放佇列</string>
     <string name="action_remove_from_playing_queue">從播放佇列中移除</string>
     <string name="action_add_to_playlist">加入播放清單...</string>
@@ -46,6 +49,7 @@
     <string name="year">年代</string>
     <string name="track">音軌</string>
     <string name="track_hint">"音軌（用2表示第2首歌或3004表示CD3的第4首歌）"</string>
+    <string name="lyrics">歌詞</string>
     <string name="album_or_artist_empty">專輯名稱或演出者欄是空的</string>
     <string name="saving_changes">正在儲存變更…</string>
     <string name="saving_to_file">正在儲存為檔案...</string>
@@ -116,6 +120,7 @@
     <string name="pref_header_images">圖片</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
     <string name="pref_title_navigation_bar">彩色的導航列</string>
+    <string name="pref_title_app_shortcuts">彩色的應用快捷方式</string>
     <string name="pref_title_set_default_start_page">首頁</string>
     <string name="pref_title_album_art_on_lockscreen">顯示專輯封面</string>
     <string name="pref_title_auto_download_artist_images">自動下載演出者圖片</string>
@@ -155,6 +160,7 @@
     <string name="playlist_name_empty">播放清單名稱</string>
     <string name="song">歌曲</string>
     <string name="pref_only_lollipop">"只適用於 Lollipop。"</string>
+    <string name="pref_only_nougat_mr1">"只在 Nougat 7.1 裝置上可用"</string>
     <string name="pref_summary_album_art_on_lockscreen">將播放中歌曲的專輯封面設為鎖定螢幕背景。</string>
     <string name="pref_summary_blurred_album_art">在鎖定畫面上模糊化專輯圖片。第三方程式和小工具可能不正常運作。</string>
     <string name="pref_summary_colored_notification">"\u72c0\u614b\u5217\u984f\u8272\u8207\u5c08\u8f2f\u5716\u7247\u984f\u8272\u4e00\u81f4"</string>
@@ -168,6 +174,7 @@
     <string name="pref_summary_ignore_media_store_artwork">提高專輯封面的成像品質，但會造成較長的讀取時間。建議只有在您對低畫質的專輯封面有問題時才開啟此選項。</string>
     <string name="pref_summary_colored_playback_controls_now_playing">\u5c07\u5c08\u8f2f\u5c01\u9762\u7684\u4e3b\u8272\u8abf\u8a2d\u70ba\u64ad\u653e\uff0f\u66ab\u505c\u3001\u96a8\u6a5f\u64ad\u653e\u3001\u91cd\u64ad\u548c\u9032\u5ea6\u5217\u7684\u984f\u8272\u3002</string>
     <string name="pref_summary_colored_navigation_bar">將專輯封面的主色調設為導航列的顏色。</string>
+    <string name="pref_summary_colored_app_shortcuts">將主色調設為應用快捷方式的顏色</string>
     <string name="pref_summary_audio_ducking">通知鈴聲、導航語音等。</string>
     <string name="could_not_download_album_cover">"\u7121\u6cd5\u4e0b\u8f09\u5408\u9069\u7684\u5c08\u8f2f\u5c01\u9762\u3002"</string>
     <string name="search_hint">掃描音樂庫…</string>
@@ -264,4 +271,7 @@
     <string name="copied_device_info_to_clipboard">複製裝置資訊到剪貼版。</string>
     <string name="your_account_data_is_only_used_for_authentication">您的帳戶資料僅用於驗證。</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">將被轉發到問題追蹤網站。</string>
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">隨機播放</string>
+    <string name="app_shortcut_top_tracks_short">最佳單曲</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 74a2614c..a515cb50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -278,16 +278,12 @@
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    
     <!-- App Shortcuts -->
     <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
     <string name="app_shortcut_shuffle_all_short">Shuffle</string>
-
     <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
     <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    
     <string name="app_shortcut_last_added_long">@string/last_added</string>
     <string name="app_shortcut_last_added_short">@string/last_added</string>
-
     <string name="playlist_is_empty">Playlist is empty</string>
 </resources>