diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java
index eb1f79c4..baddab7a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java
@@ -102,7 +102,7 @@ public abstract class AbsMainActivityRecyclerViewFragment extends AbsMainActivit
 
     @StringRes
     protected int getEmptyMessage() {
-        return R.string.nothing_here;
+        return R.string.empty;
     }
 
     protected abstract RecyclerView.LayoutManager createLayoutManager();
diff --git a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 3a90e143..65c24d6b 100644
--- a/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -19,7 +19,7 @@
         android:textSize="@dimen/empty_text_size"
         android:textColor="?android:textColorSecondary"
         android:fontFamily="sans-serif-light"
-        android:text="@string/nothing_here"
+        android:text="@string/empty"
         android:layout_gravity="center" />
 
     <com.kabouzeid.gramophone.views.FastScroller
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 8b07c7d3..1456ebeb 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -52,7 +52,6 @@
     <string name="action_re_download_artist_image">تحديث صورة الفنان</string>
     <string name="updating">يتم التحديث...</string>
     <string name="added_title_to_playing_queue">"تمت الإضافة إلى قائمة الانتظار"</string>
-    <string name="action_remove_from_playlist">حذف من قائمة التشغيل</string>
     <string name="new_playlist_action">قائمة تشغيل جديدة...</string>
     <string name="action_grid_columns">عدد قوائم الشبكة</string>
     <string name="action_grid_columns_land">قائمة شبكية (أرضية)</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9b2aac5f..827323c7 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_re_download_artist_image">Změnit obrázek umělce</string>
     <string name="updating">Aktualizace...</string>
     <string name="added_title_to_playing_queue">"Přidána 1 skladba do fronty."</string>
-    <string name="action_remove_from_playlist">Vymazat z playlistu</string>
     <string name="new_playlist_action">Nový playlist...</string>
     <string name="action_grid_columns">Počet sloupců mřížky</string>
     <string name="action_grid_columns_land">Počet sloupců mřížky (Horizontálně)</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 244b9e53..5ab327b3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,6 +4,7 @@
     <string name="currently_listening_to_x_by_x">Höre gerade %1$s von %2$s</string>
     <string name="the_audio_file">Die Audiodatei</string>
     <string name="do_you_want_to_set_x_as_ringtone">Willst du %1$s als deinen Klingelton verwenden?</string>
+    <string name="x_has_been_set_as_ringtone">%1$s wird jetzt als dein Klingelton verwendet.</string>
     <string name="action_set_as_ringtone">Als Klingelton verwenden</string>
     <string name="action_share">Teilen</string>
     <string name="action_settings">"Einstellungen"</string>
@@ -69,12 +70,24 @@
     <string name="deleted_playlist_x">Playlist %1$s gelöscht</string>
     <string name="couldnot_create_playlist_x">Playlist %1$s konnte nicht erstellt werden</string>
     <string name="delete_playlist_x"><![CDATA[Willst du die Playlist <b>%1$s</b> löschen?]]></string>
+    <string name="delete_x_playlists"><![CDATA[
+Willst du <b>%1$d</b> Playlists löschen?
+    ]]></string>
     <string name="delete_song_x"><![CDATA[Willst du den Titel <b>%1$s</b> löschen?]]></string>
     <string name="delete_x_songs"><![CDATA[Willst du <b>%1$d</b> Titel löschen?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[
+Willst du den Titel <b>%1$s</b> aus der Playlist entfernen?
+    ]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[
+Willst du <b>%1$d</b> Titel aus der Playlist entfernen?
+    ]]></string>
     <string name="delete_song_title">Lösche Titel</string>
     <string name="delete_songs_title">Lösche Titel</string>
+    <string name="remove_song_from_playlist_title">Entferne Titel von Playlist</string>
+    <string name="remove_songs_from_playlist_title">Entferne Titel von Playlist</string>
     <string name="rename_playlist_title">Playlist umbenennen</string>
     <string name="delete_playlist_title">Lösche Playlist</string>
+    <string name="delete_playlists_title">Lösche Playlists</string>
     <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
     <string name="new_playlist_title">Neue Playlist</string>
     <string name="delete_warning">"Achtung: Diese Operation kann nicht rückgängig gemacht werden."</string>
@@ -98,12 +111,16 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">Tag Editor</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Überall sonst</string>
     <string name="pref_title_colored_album_footers">Farbige Balken unter den Alben</string>
+    <string name="pref_title_force_square_album_art">Quadratisches Album Cover erzwingen</string>
     <string name="no_equalizer">Es wurde kein Equalizer gefunden</string>
     <string name="no_audio_ID">"Keine Audio ID, spiele etwas ab und versuche es erneut."</string>
     <string name="navigation_drawer_open">Öffne Navigation Drawer</string>
     <string name="navigation_drawer_close">"Schließe Navigation Drawer"</string>
     <string name="delete_action">Löschen</string>
+    <string name="remove_action">Entferne</string>
     <string name="rename_action">Umbenennen</string>
+    <string name="create_action">Erstelle</string>
+    <string name="x_selected">%1$d ausgewählt</string>
     <string name="select">Auswählen</string>
     <string name="default_str">Standard</string>
     <string name="primary_color">Primäre Farbe</string>
@@ -113,13 +130,19 @@
     <string name="update_image">Bild aktualisieren</string>
     <string name="playlist_empty_text">Die Playlist ist leer</string>
     <string name="no_playlists">Keine Playlists</string>
+    <string name="no_albums">Keine Alben</string>
+    <string name="no_songs">Keine Songs</string>
+    <string name="no_artists">Keine Interpreten</string>
+    <string name="empty">Leer</string>
     <string name="playlist_name">Playlist Name</string>
     <string name="song">Titel</string>
     <string name="pref_only_lollipop">"Nur auf Android Lollipop verfügbar"</string>
     <string name="pref_summary_colored_album_footers">"Die Titel der Alben im Raster passend zu ihrer Cover Farbe färben."</string>
+    <string name="pref_summary_force_square_album_art">Das Album Cover in der now playing Ansicht wird gezwungen quadratisch zu sein</string>
     <string name="failed_download_albumart">"Das Cover für dieses Album konnte nicht heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
     <string name="rescanning_media">Medien werden erneut eingescannt...</string>
+    <string name="other">Andere</string>
     <string-array name="update_album_cover_options">
         <item>Von Last.fm herunterladen</item>
         <item>Aus lokalem Speicher wählen</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6b1fd5c6..95b041b5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -55,7 +55,6 @@
     <string name="added_title_to_playing_queue">"Προστέθηκε ένας τίτλος στη σειρά αναπαραγωγής"</string>
     <string name="added_x_titles_to_playing_queue">Προστέθηκαν %1$d εικονίδια στην σειρά αναπαραγωγής</string>
     <string name="title_activity_playlist_detail">Δραστηριότητα λίστας</string>
-    <string name="action_remove_from_playlist">Διαγραφή από τη λίστα αναπαραγωγής</string>
     <string name="new_playlist_action">Νέα λίστα αναπαραγωγής...</string>
     <string name="action_grid_columns">Στήλες πλέγματος</string>
     <string name="action_grid_columns_land">Στήλες πλέγματος</string>
@@ -69,16 +68,8 @@
     ]]></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>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index b2a994a1..3fedc77c 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"1 título añadido a la cola de reproducción"</string>
     <string name="added_x_titles_to_playing_queue">%1$d título(s) añadido(s) a la cola de reproducción</string>
     <string name="title_activity_playlist_detail">Actividad de la lista de reproducción</string>
-    <string name="action_remove_from_playlist">Borrar de la lista de reproducción</string>
     <string name="new_playlist_action">Nueva lista de reproducción...</string>
     <string name="action_grid_columns">Columnas de la cuadrícula</string>
     <string name="action_grid_columns_land">Columnas de la cuadrícula (apaisado)</string>
@@ -76,16 +75,8 @@
     ]]></string>
     <string name="delete_song_x"><![CDATA[¿Seguro que deseas eliminar la canción <b>%1$s</b>?]]></string>
     <string name="delete_x_songs"><![CDATA[¿Seguro que desea borrar <b>%1$d</b> canciones?]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
-¿Quiere eliminar la canción <b>%1$s</b> de la lista de reproducción?
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
- ¿Quiere eliminar las canciónes <b>%1$d</b> de la lista de reproducción? 
-    ]]></string>
     <string name="delete_song_title">Borrar canción</string>
     <string name="delete_songs_title">Borrar canciones</string>
-    <string name="remove_song_from_playlist_title">Eliminar canción de la lista de reproducción</string>
-    <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista de reproducción</string>
     <string name="rename_playlist_title">Renombrar lista de reproducción</string>
     <string name="delete_playlist_title">Borrar lista de reproducción</string>
     <string name="delete_playlists_title">Eliminar listas de reproducción</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index feb871a1..6f9f0f39 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -52,7 +52,6 @@
     <string name="updating">Päivitetään...</string>
     <string name="added_title_to_playing_queue">"Kappale lisätty jonoon"</string>
     <string name="added_x_titles_to_playing_queue">{%1$d} kappaletta lisättiin jonoon</string>
-    <string name="action_remove_from_playlist">Poista soittolistalta</string>
     <string name="new_playlist_action">Uusi soittolista</string>
     <string name="action_grid_columns">Ruudukon sarakkeet</string>
     <string name="action_grid_columns_land">Ruudukon sarakkeet (Vaaka)</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 90f8ff43..6f7ca9b6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="what_do_you_want_to_share">Qu\'est-ce que vous voulez partager ?</string>
+    <string name="currently_listening_to_x_by_x">Vous écoutez %1$ss de %2$s</string>
+    <string name="the_audio_file">Le fichier audio</string>
+    <string name="do_you_want_to_set_x_as_ringtone">Voulez-vous définir %1$ss comme sonnerie?</string>
+    <string name="x_has_been_set_as_ringtone">%1$s a été défini comme sonnerie.</string>
+    <string name="action_set_as_ringtone">Définir comme sonnerie</string>
+    <string name="action_share">Partager</string>
     <string name="action_settings">"Paramètres"</string>
     <string name="action_about">À propos</string>
     <string name="action_currently_playing">Lecture en cours</string>
@@ -21,6 +28,7 @@
     <string name="biography_unavailable">Désolé, nous n\'avons pas trouvé la biographie correspondant à cet artiste.</string>
     <string name="biography">Biographie</string>
     <string name="audio_focus_denied">Nous n\'avons pas pu obtenir le focus audio</string>
+    <string name="title_activity_tag_editor">Éditeur d\'infos</string>
     <string name="tag_editor">Éditeur d\'infos</string>
     <string name="album">Album</string>
     <string name="artist">Artiste</string>
@@ -32,6 +40,7 @@
     <string name="album_or_artist_empty">Veuillez indiquer le nom et l\'artiste de l\'album.</string>
     <string name="writing_file_number">Fichier en cours d\'écriture</string>
     <string name="saving_changes">Sauvegarde en cours...</string>
+    <string name="title_activity_album_tag_editor">Éditeur d\'album</string>
     <string name="label_details">Détails</string>
     <string name="label_file_name">Nom du fichier</string>
     <string name="label_file_path">Chemin du fichier</string>
@@ -52,7 +61,7 @@
     <string name="updating">Actualisation...</string>
     <string name="added_title_to_playing_queue">"1 titre ajouté à la file de lecture."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titres ajoutés à la file de lecture.</string>
-    <string name="action_remove_from_playlist">Supprimer de la playlist</string>
+    <string name="action_remove_from_playlist">Retirer de la playlist</string>
     <string name="new_playlist_action">Nouvelle playlist...</string>
     <string name="action_grid_columns">Nombre de colonnes</string>
     <string name="action_grid_columns_land">Nombre de colonnes (paysage)</string>
@@ -61,8 +70,10 @@
     <string name="deleted_playlist_x">Playlist %1$s supprimée.</string>
     <string name="couldnot_create_playlist_x">Impossible de créer la playlist %1$s.</string>
     <string name="delete_playlist_x"><![CDATA[ Voulez-vous supprimer la playlist <b>%1$s</b> ? ]]></string>
+    <string name="delete_x_playlists"><![CDATA[Voulez-vous supprimer les playlists <b>%1$d</b> ?]]></string>
     <string name="delete_song_x"><![CDATA[ Voulez-vous supprimer le titre <b>%1$s</b> ? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Voulez-vous supprimer <b>%1$d</b> titres ? ]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Voulez-vous retirer <b>%1$s</b> de la playlist?]]></string>
     <string name="delete_song_title">Supprimer le titre</string>
     <string name="delete_songs_title">Supprimer les titres</string>
     <string name="rename_playlist_title">Renommer la playlist</string>
@@ -96,6 +107,7 @@
     <string name="navigation_drawer_close">"Fermer le volet de navigation"</string>
     <string name="delete_action">Supprimer</string>
     <string name="rename_action">Renommer</string>
+    <string name="create_action">Créer</string>
     <string name="select">Sélectionner</string>
     <string name="default_str">Par défaut</string>
     <string name="primary_color">Couleur primaire</string>
@@ -112,6 +124,7 @@
     <string name="failed_download_albumart">"Impossible de télécharger la pochette pour cet album."</string>
     <string name="search_hint">Rechercher votre bibliothèque...</string>
     <string name="rescanning_media">Réanalyse des médias…</string>
+    <string name="other">Autre</string>
     <string-array name="update_album_cover_options">
         <item>Télécharger depuis Last.fm</item>
         <item>Choisir depuis le stockage interne</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4c1a7344..d8325245 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"Un brano aggiunto alla coda."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titoli aggiunti alla coda.</string>
     <string name="title_activity_playlist_detail">Attività playlist</string>
-    <string name="action_remove_from_playlist">Elimina dalla playlist</string>
     <string name="new_playlist_action">Nuova playlist...</string>
     <string name="action_grid_columns">Colonne griglia</string>
     <string name="action_grid_columns_land">Colonne griglia (schermo orizzontale)</string>
@@ -76,16 +75,8 @@
     ]]></string>
     <string name="delete_song_x"><![CDATA[        Vuoi eliminare il brano <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[        Vuoi eliminare <b>%1$d</b> brani? ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
-        Vuoi eliminare il brano <b>%1$s</b> dalla playlist? 
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
-        Vuoi eliminare <b>%1$d</b> brani dalla playlist? 
-    ]]></string>
     <string name="delete_song_title">Elimina brano</string>
     <string name="delete_songs_title">Elimina brani</string>
-    <string name="remove_song_from_playlist_title">Elimina brano dalla playlist</string>
-    <string name="remove_songs_from_playlist_title">Elimina brani dalla playlist</string>
     <string name="rename_playlist_title">Rinomina playlist</string>
     <string name="delete_playlist_title">Elimina playlist</string>
     <string name="delete_playlists_title">Elimina playlist</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c6cefa13..1ffc929f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="what_do_you_want_to_share">무엇을 공유하고 싶으십니까?</string>
+    <string name="currently_listening_to_x_by_x">현재 %1$s 에서 %2$s 까지 재생 중</string>
+    <string name="the_audio_file">음악 파일</string>
+    <string name="do_you_want_to_set_x_as_ringtone">%1$s을(를) 전화 벨소리로 설정하시겠습니까?</string>
+    <string name="x_has_been_set_as_ringtone">%1$s을(를) 전화 벨소리로 설정하였습니다.</string>
+    <string name="action_set_as_ringtone">전화 벨소리로 설</string>
+    <string name="action_share">공유</string>
     <string name="action_settings">"설정"</string>
     <string name="action_about">정보</string>
     <string name="action_currently_playing">지금 재생 중</string>
@@ -17,10 +24,11 @@
     <string name="songs">노래</string>
     <string name="playlists">재생목록</string>
     <string name="nothing_playing">재생 중인 곡이 없습니다.</string>
-    <string name="unplayable_file">음악을 재생하려던 중 오류가 발생했습니다.</string>
+    <string name="unplayable_file">노래를 재생하려던 중 오류가 발생했습니다.</string>
     <string name="biography_unavailable">이 아티스트와 일치하는 정보를 찾을 수 없습니다.</string>
     <string name="biography">정보</string>
     <string name="audio_focus_denied">Audio focus 권한을 얻을 수 없습니다.</string>
+    <string name="title_activity_tag_editor">테그 편집기</string>
     <string name="tag_editor">테그 편집기</string>
     <string name="album">앨범</string>
     <string name="artist">아티스트</string>
@@ -32,6 +40,7 @@
     <string name="album_or_artist_empty">앨범 제목이나 앨범 아티스트 란이 비었습니다.</string>
     <string name="writing_file_number">파일에 정보 기록 중...</string>
     <string name="saving_changes">변경사항 저장 중...</string>
+    <string name="title_activity_album_tag_editor">앨범 테크 편집기</string>
     <string name="label_details">세부정보</string>
     <string name="label_file_name">파일 이름</string>
     <string name="label_file_path">파일 경로</string>
@@ -52,7 +61,7 @@
     <string name="updating">변경 중...</string>
     <string name="added_title_to_playing_queue">"재생 대기열에 1개의 음악을 추가했습니다."</string>
     <string name="added_x_titles_to_playing_queue">%1$d개의 타이틀을 재생 대기열에 추가했습니다.</string>
-    <string name="action_remove_from_playlist">재생목록에서 삭제</string>
+    <string name="action_remove_from_playlist">재생목록에서 제거</string>
     <string name="new_playlist_action">새로운 재생목록...</string>
     <string name="action_grid_columns">가로 격자</string>
     <string name="action_grid_columns_land">가로 격자 (가로모드일 때)</string>
@@ -61,12 +70,18 @@
     <string name="deleted_playlist_x">재생목록 \'%1$s\'을 삭제했습니다.</string>
     <string name="couldnot_create_playlist_x">재생목록 \'%1$s\'을(를) 만들 수 없습니다.</string>
     <string name="delete_playlist_x"><![CDATA[재생목록 <b>%1$s</b>을(를) 삭제하시겠습니까?]]></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="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="add_playlist_title">"재생목록에 추가"</string>
     <string name="new_playlist_title">새로운 재생목록</string>
     <string name="delete_warning">"경고 : 이 작업은 되돌릴 수 없습니다."</string>
@@ -90,13 +105,18 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">테그 편집기 화면에서</string>
     <string name="pref_title_colored_navigation_bar_other_screens">기타 다른 모든 곳에서</string>
     <string name="pref_title_colored_album_footers">색칠된 앨범 카드</string>
+    <string name="pref_title_force_square_album_art">강제로 정사각형 앨범아트 적용</string>
+    <string name="pref_title_opaque_toolbar_now_playing">불투명한 지금 재생 중 툴바</string>
     <string name="no_equalizer">설치된 이퀄라이저가 없습니다.</string>
     <string name="no_audio_ID">"오디오 ID가 없습니다.
 아무 것이나 재생하시고 다시 시도해 주십시오."</string>
     <string name="navigation_drawer_open">네비게이션 서랍 열기</string>
     <string name="navigation_drawer_close">"네비게이션 서랍 닫기"</string>
     <string name="delete_action">삭제</string>
+    <string name="remove_action">제거</string>
     <string name="rename_action">이름 변경</string>
+    <string name="create_action">만들기</string>
+    <string name="x_selected">%1$d 선택됨</string>
     <string name="select">선택</string>
     <string name="default_str">기본</string>
     <string name="primary_color">주 색상</string>
@@ -106,13 +126,20 @@
     <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_artists">아티스트가 없습니다.</string>
+    <string name="empty">없음</string>
     <string name="playlist_name">재생목록 이름</string>
     <string name="song">노래</string>
     <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 가능합니다."</string>
     <string name="pref_summary_colored_album_footers">"앨범 커버의 색상에 맞추어 앨범 카드가 색칠됩니다."</string>
+    <string name="pref_summary_force_square_album_art">지금 재생 중 화면의 앨범 아트 이미지가 강제로 정사각형으로 보이게 합니다.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">지금 재생 중 화면의 툴바를 투명하게 해 앨범 아트를 가리지 않게 합니다.</string>
     <string name="failed_download_albumart">"이 앨범의 앨범 커버를 다운로드할 수 없습니다."</string>
     <string name="search_hint">저장소 검색...</string>
     <string name="rescanning_media">미디어 재스캐닝 중...</string>
+    <string name="other">기타</string>
     <string-array name="update_album_cover_options">
         <item>Last.fm에서 다운로드</item>
         <item>저장소에서 고르기</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index fbf8498b..e4454c8a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="what_do_you_want_to_share">Wat wil je delen?</string>
+    <string name="currently_listening_to_x_by_x">Je luistert naar %1$s door %2$s</string>
+    <string name="the_audio_file">Het audiobestand</string>
+    <string name="do_you_want_to_set_x_as_ringtone">Wil je %1$s als beltoon instellen?</string>
+    <string name="x_has_been_set_as_ringtone">%1$s is ingesteld als beltoon.</string>
+    <string name="action_set_as_ringtone">Instellen als beltoon</string>
+    <string name="action_share">Delen</string>
     <string name="action_settings">"Instellingen"</string>
     <string name="action_about">Over</string>
     <string name="action_currently_playing">Momenteel spelend</string>
@@ -17,7 +24,7 @@
     <string name="songs">Nummers</string>
     <string name="playlists">Afspeellijsten</string>
     <string name="nothing_playing">Niets wordt afgespeeld</string>
-    <string name="unplayable_file">Sorry, er is een probleem ontstaan tijdens het afspelen van dit nummer.</string>
+    <string name="unplayable_file">Sorry - er is een probleem ontstaan tijdens het afspelen van dit nummer.</string>
     <string name="biography_unavailable">Sorry, het is ons niet gelukt om een passende biografie te vinden voor deze artiest.</string>
     <string name="biography">Biografie</string>
     <string name="audio_focus_denied">Het is niet gelukt om audio focus te krijgen.</string>
@@ -55,7 +62,6 @@
     <string name="added_title_to_playing_queue">"1 titel toegevoegd aan de afspeelwachtrij."</string>
     <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan de afspeellijst.</string>
     <string name="title_activity_playlist_detail">"Afspeellijst activiteit "</string>
-    <string name="action_remove_from_playlist">Verwijderen uit afspeellijst</string>
     <string name="new_playlist_action">Nieuwe afspeellijst...</string>
     <string name="action_grid_columns">Rasterkolommen</string>
     <string name="action_grid_columns_land">Rasterkolommen (Land)</string>
@@ -67,14 +73,8 @@
     <string name="delete_x_playlists"><![CDATA[Wil je <b>%1$d</b> afspeellijsten verwijderen?]]></string>
     <string name="delete_song_x"><![CDATA[Wil je het nummer <b>%1$s</b> verwijderen?]]></string>
     <string name="delete_x_songs"><![CDATA[Wil je <b>%1$d</b> nummers verwijderen?]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Wil je het nummer <b>%1$s</b> verwijderen van de afspeellijst?]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
-Wil je <b>%1$d</b> nummers verwijderen uit de afspeellijst?
-    ]]></string>
     <string name="delete_song_title">Verwijder nummer</string>
     <string name="delete_songs_title">Verwijder nummers</string>
-    <string name="remove_song_from_playlist_title">Verwijder nummer uit afspeellijst</string>
-    <string name="remove_songs_from_playlist_title">Verwijder nummers uit afspeellijst</string>
     <string name="rename_playlist_title">Hernoem afspeellijst</string>
     <string name="delete_playlist_title">Verwijder afspeellijst</string>
     <string name="delete_playlists_title">Verwijder afspeellijst</string>
@@ -101,12 +101,15 @@ Wil je <b>%1$d</b> nummers verwijderen uit de afspeellijst?
     <string name="pref_title_colored_navigation_bar_tag_editor">Label bewerker</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Overal elders</string>
     <string name="pref_title_colored_album_footers">Gekleurde album footers</string>
+    <string name="pref_title_force_square_album_art">Forceer vierkante albumhoes</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Ondoorzichtige werkbalk in afspeelscherm</string>
     <string name="no_equalizer">Geen equalizer gevonden</string>
     <string name="no_audio_ID">"Geen audio ID, speel iets af en probeer opnieuw. "</string>
     <string name="navigation_drawer_open">Open navigatiebalk</string>
     <string name="navigation_drawer_close">"Sluit navigatiebalk"</string>
     <string name="delete_action">Verwijderen</string>
     <string name="rename_action">Hernoemen</string>
+    <string name="create_action">Aanmaken</string>
     <string name="select">Selecteer</string>
     <string name="default_str">Standaard</string>
     <string name="primary_color">Primaire kleur</string>
@@ -120,9 +123,12 @@ Wil je <b>%1$d</b> nummers verwijderen uit de afspeellijst?
     <string name="song">Nummer</string>
     <string name="pref_only_lollipop">"Alleen beschikbaar op Lollipop. "</string>
     <string name="pref_summary_colored_album_footers">"Album footers in het raster worden gekleurd met het palet van de albumhoes. "</string>
+    <string name="pref_summary_force_square_album_art">Albumhoes in het afspeelscherm is geforceerd vierkant.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">De werkbalk in het afspeelscherm is ondoorzichtig en bedekt niet langer de albumhoes.</string>
     <string name="failed_download_albumart">"Het lukt niet om de albumhoes te downloaden. "</string>
     <string name="search_hint">Zoek in je bibliotheek...</string>
     <string name="rescanning_media">Media herscannen...</string>
+    <string name="other">Andere</string>
     <string-array name="update_album_cover_options">
         <item>Downloaden van Last.fm</item>
         <item>Kies vanuit lokale opslag</item>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 030bd622..ff5a4f82 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -55,7 +55,6 @@
     <string name="added_title_to_playing_queue">"La 1 tittel til songkøen."</string>
     <string name="added_x_titles_to_playing_queue">La %1$d titlar til songkøen.</string>
     <string name="title_activity_playlist_detail">Spelelisteaktivitet</string>
-    <string name="action_remove_from_playlist">Fjern frå speleliste</string>
     <string name="new_playlist_action">Ny speleliste...</string>
     <string name="action_grid_columns">Rutenettkolonnar</string>
     <string name="action_grid_columns_land">Rutenettkolonnar (land)</string>
@@ -75,16 +74,8 @@
     <string name="delete_x_songs"><![CDATA[
         Ynskjer du å slette <b>%1$d</b> songar? 
     ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
-        Ynskjer du å slette songen <b>%1$s</b> frå spelelista? 
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
-        Ynskjer du å slette <b>%1$d</b> songar frår spelelista? 
-    ]]></string>
     <string name="delete_song_title">Slett song</string>
     <string name="delete_songs_title">Slett songar</string>
-    <string name="remove_song_from_playlist_title">Slett song frå speleliste</string>
-    <string name="remove_songs_from_playlist_title">Slett songar frå speleliste</string>
     <string name="rename_playlist_title">Gje nytt namn til speleliste</string>
     <string name="delete_playlist_title">Slett speleliste</string>
     <string name="delete_playlists_title">Slett spelelister</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dbbb8403..314b649d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"Dodano 1 tytuł do kolejki odtwarzania"</string>
     <string name="added_x_titles_to_playing_queue">Dodano %1$d tytuły do kolejki odtwarzania</string>
     <string name="title_activity_playlist_detail">Aktywność list odtwarzania</string>
-    <string name="action_remove_from_playlist">Usuń z listy odtwarzania</string>
     <string name="new_playlist_action">Nowa lista odtwarzania...</string>
     <string name="action_grid_columns">Siatka kolumn</string>
     <string name="action_grid_columns_land">Siatka kolumn (poziomo)</string>
@@ -74,12 +73,8 @@
     <string name="delete_x_playlists"><![CDATA[Czy chcesz usunąć <b>%1$d</b> listy odtwarzania? ]]></string>
     <string name="delete_song_x"><![CDATA[ Czy chcesz usunąć utwór <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Czy chcesz usunąć  <b>%1$d</b> utworów? ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Czy chcesz usunąć utwór <b>%1$s</b> z listy odtwarzania? ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Czy chcesz usunąć <b>%1$d</b> utworów z listy odtwarzania? ]]></string>
     <string name="delete_song_title">Usuwanie utworu</string>
     <string name="delete_songs_title">Usuń utwory</string>
-    <string name="remove_song_from_playlist_title">Usuń utwór z listy odtwarzania</string>
-    <string name="remove_songs_from_playlist_title">Usuń utwory z listy odtwarzania</string>
     <string name="rename_playlist_title">Zmień nazwę listy odtwarzania</string>
     <string name="delete_playlist_title">Usuń listę odtwarzania</string>
     <string name="delete_playlists_title">Usuń listy odtwarzania</string>
@@ -106,7 +101,7 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">Edytor tagów</string>
     <string name="pref_title_colored_navigation_bar_other_screens">W każdym innym miejscu</string>
     <string name="pref_title_colored_album_footers">Kolorowa stopka albumu</string>
-    <string name="pref_title_force_square_album_art">Wymuś kadrowanie okładek</string>
+    <string name="pref_title_force_square_album_art">Kadrowanie okładek</string>
     <string name="pref_title_opaque_toolbar_now_playing">Nieprzeźroczystość paska narzędzi na ekranie \'\'Obecnie Grane\'\'</string>
     <string name="no_equalizer">Nie znaleziono korektora</string>
     <string name="no_audio_ID">"Brak ID dźwięku, puść coś i spróbuj ponownie"</string>
@@ -128,8 +123,8 @@
     <string name="song">Utwór</string>
     <string name="pref_only_lollipop">"Dostępne tylko w androidzie Lollipop"</string>
     <string name="pref_summary_colored_album_footers">"Stopki albumów w widoku siatki mają tonacje okładek"</string>
-    <string name="pref_summary_force_square_album_art">Wymuszono kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">Pasek narzędzi na ekranie \'\'Obecnie Grane\'\' jest nieprzeźroczysty i nie zasłania już okładki</string>
+    <string name="pref_summary_force_square_album_art">Wymusza kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Zaznacz, a pasek narzędzi na ekranie \'\'Obecnie Grane\'\' będzie nieprzeźroczysty i nie zasłoni już okładki</string>
     <string name="failed_download_albumart">"Nie można pobrać okładki dla tego albumu"</string>
     <string name="search_hint">Szukaj w bibliotece...</string>
     <string name="rescanning_media">Ponowny skan nośnika...</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 989a16ca..69df21e1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"1 título adicionado à lista de reprodução"</string>
     <string name="added_x_titles_to_playing_queue">%1$d faixas adicionadas à lista de reprodução.</string>
     <string name="title_activity_playlist_detail">Atividade da Lista de Reprodução</string>
-    <string name="action_remove_from_playlist">Excluir da playlist</string>
     <string name="new_playlist_action">Nova playlist...</string>
     <string name="action_grid_columns">Colunas da grade</string>
     <string name="action_grid_columns_land">Colunas da grade (Horizontal)</string>
@@ -76,16 +75,8 @@
     ]]></string>
     <string name="delete_song_x"><![CDATA[ Deseja excluir a faixa <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Deseja excluir <b>%1$d</b> faixas? ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
- Deseja excluir a música <b>%1$s</b> da playlist? 
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
- Deseja excluir <b>%1$d</b> músicas da playlist? 
-    ]]></string>
     <string name="delete_song_title">Excluir Faixa</string>
     <string name="delete_songs_title">Excluir Faixas</string>
-    <string name="remove_song_from_playlist_title">Deletar música da Playlist</string>
-    <string name="remove_songs_from_playlist_title">Deletar músicas da Playlist</string>
     <string name="rename_playlist_title">Renomear Playlist</string>
     <string name="delete_playlist_title">Excluir Playlist</string>
     <string name="delete_playlists_title">Apagar Playlists</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ce343397..93b75849 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -50,7 +50,6 @@
     <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
     <string name="updating">Atualizando...</string>
     <string name="added_title_to_playing_queue">"Adicionada uma música para a fila atual de músicas."</string>
-    <string name="action_remove_from_playlist">Apagar da playlist</string>
     <string name="action_grid_columns">Colunas da grade</string>
     <string name="action_grid_columns_land">Colunas da grade (Paisagem)</string>
     <string name="delete_warning">"Aviso: Esta operação não pode ser desfeita."</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 7a9eba36..f7947fcb 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -50,7 +50,6 @@
     <string name="action_re_download_artist_image">Actualizează imagine artist</string>
     <string name="updating">Actualizare...</string>
     <string name="added_title_to_playing_queue">"Adăugat 1 melodie la lista de redare."</string>
-    <string name="action_remove_from_playlist">Şterge din playlist</string>
     <string name="new_playlist_action">Playlist nou...</string>
     <string name="action_grid_columns">Rânduri pe grid</string>
     <string name="action_grid_columns_land">Rânduri pe grid (Orizontal)</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a39396d6..33b99d9d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -55,7 +55,6 @@
     <string name="added_title_to_playing_queue">"Добавлена 1 композиция в очередь воспроизведения"</string>
     <string name="added_x_titles_to_playing_queue">Добавлено %1$d композиций в очередь воспроизведения</string>
     <string name="title_activity_playlist_detail">Активность списка воспроизведения</string>
-    <string name="action_remove_from_playlist">Удалить из списка воспроизведения</string>
     <string name="new_playlist_action">Новый список воспроизведения...</string>
     <string name="action_grid_columns">Столбцы сетки</string>
     <string name="action_grid_columns_land">Столбцы сетки (ландшафт)</string>
@@ -69,16 +68,8 @@
     ]]></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>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index bc849c9a..376ef30b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -51,7 +51,6 @@
     <string name="action_re_download_artist_image">Uppdatera artistbild</string>
     <string name="updating">Uppdaterar ...</string>
     <string name="added_title_to_playing_queue">"Lagt till 1 titel till spellistan."</string>
-    <string name="action_remove_from_playlist">Radera från spellista</string>
     <string name="new_playlist_action">Ny spellista ...</string>
     <string name="created_playlist_x">Spellista %1$s skapad</string>
     <string name="deleted_playlist_x">Spellista %1$s raderad</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e36d5996..38cfc05e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"Çalma kuyruğuna 1 başlık eklendi"</string>
     <string name="added_x_titles_to_playing_queue">Çalma kuyruğuna %1$d başlıkları eklendi.</string>
     <string name="title_activity_playlist_detail">Çalma listesi etkinliği</string>
-    <string name="action_remove_from_playlist">Çalma listesinden sil</string>
     <string name="new_playlist_action">Yeni çalma listesi</string>
     <string name="action_grid_columns">Izgara sütunları</string>
     <string name="action_grid_columns_land">Izgara sütunları (Manzara)</string>
@@ -74,13 +73,8 @@
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> oynatma listelerini silmek istiyor musunuz?]]></string>
     <string name="delete_song_x"><![CDATA[ <b>%1$s</b> şarkısını silmek istiyor musunuz? ]]></string>
     <string name="delete_x_songs"><![CDATA[ <b>%1$d</b> bu şarkıları silmek istiyor musunuz? ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Çalma listesinden <b>%1$s</b> şarkısını silmek istiyor musunuz?]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Çalma listesinden <b>%1$d</b> şarkılarını silmek istiyor musunuz?
-]]></string>
     <string name="delete_song_title">Şarkıyı Sil</string>
     <string name="delete_songs_title">Şarkıları Sil</string>
-    <string name="remove_song_from_playlist_title">Çalma listesinden şarkı sil</string>
-    <string name="remove_songs_from_playlist_title">Çalma listesinden şarkıları sil</string>
     <string name="rename_playlist_title">Çalma Listesini Yeniden Adlandır</string>
     <string name="delete_playlist_title">Çalma Listesini Sil</string>
     <string name="delete_playlists_title">Çalma listelerini sil</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 646f9b96..3fa51cce 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -62,7 +62,6 @@
     <string name="added_title_to_playing_queue">"该曲目已加入播放队列"</string>
     <string name="added_x_titles_to_playing_queue">%1$d首曲目已加入播放队列</string>
     <string name="title_activity_playlist_detail">播放列表操作</string>
-    <string name="action_remove_from_playlist">从播放列表中删除</string>
     <string name="new_playlist_action">新建播放列表</string>
     <string name="action_grid_columns">专辑列数</string>
     <string name="action_grid_columns_land">专辑列数（横屏）</string>
@@ -79,17 +78,9 @@
     <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>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6a458f5c..c5601e68 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="what_do_you_want_to_share">你想分享那些內容？</string>
+    <string name="currently_listening_to_x_by_x">正在播放%2$s的%1$s</string>
+    <string name="the_audio_file">音檔</string>
+    <string name="do_you_want_to_set_x_as_ringtone">你想要將%1$s設為鈴聲嗎？</string>
+    <string name="x_has_been_set_as_ringtone">已將%1$s設為鈴聲。</string>
+    <string name="action_set_as_ringtone">設為鈴聲</string>
+    <string name="action_share">分享</string>
     <string name="action_settings">"設定"</string>
     <string name="action_about">關於</string>
     <string name="action_currently_playing">正在播放</string>
@@ -17,7 +24,7 @@
     <string name="songs">歌曲</string>
     <string name="playlists">音樂清單</string>
     <string name="nothing_playing">沒有正在播放的歌曲</string>
-    <string name="unplayable_file">對不起，嘗試播放歌曲時發生錯誤</string>
+    <string name="unplayable_file">對不起 - 嘗試播放歌曲時發生錯誤</string>
     <string name="biography_unavailable">對不起，無法找到與這位歌手相符的個人簡介</string>
     <string name="biography">個人簡介</string>
     <string name="audio_focus_denied">無法獲得音訊焦點</string>
@@ -47,7 +54,7 @@
     <string name="label_current_playing_queue">播放佇列</string>
     <string name="save_as_playlist">儲存為音樂清單</string>
     <string name="credits_3">圖示設計者為</string>
-    <string name="credits_1">"Gramophone是一個完全免費且遵從Material Design的音樂播放器，開發者為"</string>
+    <string name="credits_1">"Phonograph 是一個完全免費且遵從 Material Design 的音樂播放器，開發者為"</string>
     <string name="title_activity_search">搜尋</string>
     <string name="no_results">無搜尋結果</string>
     <string name="action_re_download_artist_image">更新歌手圖片</string>
@@ -55,7 +62,6 @@
     <string name="added_title_to_playing_queue">"這歌曲已加入播放佇列"</string>
     <string name="added_x_titles_to_playing_queue">已增加%1$d首歌曲到播放佇列</string>
     <string name="title_activity_playlist_detail">音樂清單活動</string>
-    <string name="action_remove_from_playlist">從音樂清單移除</string>
     <string name="new_playlist_action">新增音樂清單</string>
     <string name="action_grid_columns">專輯網格列數</string>
     <string name="action_grid_columns_land">專輯網格列數（橫向）</string>
@@ -73,16 +79,8 @@
 你想移除這首歌曲： <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>
@@ -109,12 +107,15 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">編輯音樂標籤</string>
     <string name="pref_title_colored_navigation_bar_other_screens">其他任何地方</string>
     <string name="pref_title_colored_album_footers">使用變色的專輯標籤</string>
+    <string name="pref_title_force_square_album_art">強制使用正方形專輯封面</string>
+    <string name="pref_title_opaque_toolbar_now_playing">正在播放介面使用不透明工具欄</string>
     <string name="no_equalizer">沒有找到均衡器</string>
     <string name="no_audio_ID">"沒有音訊ID，請播放並重試。"</string>
     <string name="navigation_drawer_open">打開側選單</string>
     <string name="navigation_drawer_close">"關閉側選單"</string>
     <string name="delete_action">刪除</string>
     <string name="rename_action">重新命名</string>
+    <string name="create_action">創建</string>
     <string name="select">選取</string>
     <string name="default_str">預設</string>
     <string name="primary_color">主色調</string>
@@ -126,13 +127,16 @@
     <string name="no_playlists">無音樂清單</string>
     <string name="playlist_name">音樂清單名稱</string>
     <string name="song">歌曲</string>
-    <string name="pref_only_lollipop">"只適用於Lollipop。"</string>
+    <string name="pref_only_lollipop">"只適用於 Lollipop。"</string>
     <string name="pref_summary_colored_album_footers">"在專輯頁面中的專輯標籤會隨其封面顏色而改變。"</string>
+    <string name="pref_summary_force_square_album_art">於正在播放介面中強制使用正方形專輯封面。</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">於正在播放介面中使用不透明工具欄且不再覆蓋專輯封面。</string>
     <string name="failed_download_albumart">"無法下載此專輯資訊。"</string>
     <string name="search_hint">正在掃描…</string>
     <string name="rescanning_media">正在重新掃描媒體庫…</string>
+    <string name="other">其他</string>
     <string-array name="update_album_cover_options">
-        <item>從Last.fm下載</item>
+        <item>從 Last.FM 下載</item>
         <item>從本儲存裝置選取</item>
         <item>網路搜尋</item>
         <item>刪除封面</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1aab21b..2ce5125d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <string name="what_do_you_want_to_share">What do you want to share?</string>
     <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s</string>
     <string name="the_audio_file">The audio file</string>
@@ -8,7 +7,7 @@
     <string name="x_has_been_set_as_ringtone">%1$s has been set as your ringtone.</string>
     <string name="action_set_as_ringtone">Set as ringtone</string>
     <string name="action_share">Share</string>
-    <string name="action_settings">Settings</string>
+    <string name="action_settings">"Settings"</string>
     <string name="action_about">About</string>
     <string name="action_currently_playing">Currently playing</string>
     <string name="action_playing_queue">Playing queue</string>
@@ -37,7 +36,7 @@
     <string name="album_artist">Album artist</string>
     <string name="year">Year</string>
     <string name="track">Track</string>
-    <string name="track_hint">Track (2 for track 2 or 3004 for CD3 track 4)</string>
+    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
     <string name="album_or_artist_empty">The album title or the album artist text field is empty.</string>
     <string name="writing_file_number">Writing file</string>
     <string name="saving_changes">Saving changes…</string>
@@ -55,7 +54,7 @@
     <string name="label_current_playing_queue">Playing queue</string>
     <string name="save_as_playlist">Save as playlist</string>
     <string name="credits_3">Icon by</string>
-    <string name="credits_1">Phonograph is a completely free material designed music player by</string>
+    <string name="credits_1">"Phonograph is a completely free material designed music player by"</string>
     <string name="title_activity_search">Search</string>
     <string name="no_results">No results</string>
     <string name="action_re_download_artist_image">Update artist image</string>
@@ -67,29 +66,16 @@
     <string name="new_playlist_action">New playlist…</string>
     <string name="action_grid_columns">Grid columns</string>
     <string name="action_grid_columns_land">Grid columns (Land)</string>
-
     <string name="inserted_x_songs_into_playlist">Inserted %1$d songs into this playlist.</string>
     <string name="created_playlist_x">Created playlist %1$s</string>
     <string name="deleted_playlist_x">Deleted playlist %1$s</string>
     <string name="couldnot_create_playlist_x">Could not create playlist %1$s</string>
-    <string name="delete_playlist_x"><![CDATA[
-        Do you want to delete the playlist <b>%1$s</b>?
-    ]]></string>
-    <string name="delete_x_playlists"><![CDATA[
-        Do you want to delete <b>%1$d</b> playlists?
-    ]]></string>
-    <string name="delete_song_x"><![CDATA[
-        Do you want to delete the song <b>%1$s</b>?
-    ]]></string>
-    <string name="delete_x_songs"><![CDATA[
-        Do you want to delete <b>%1$d</b> songs?
-    ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[
-        Do you want to remove the song <b>%1$s</b> from the playlist?
-    ]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[
-        Do you want to remove <b>%1$d</b> songs from the playlist?
-    ]]></string>
+    <string name="delete_playlist_x"><![CDATA[Do you want to delete the playlist <b>%1$s</b>?]]></string>
+    <string name="delete_x_playlists"><![CDATA[Do you want to delete <b>%1$d</b> playlists?]]></string>
+    <string name="delete_song_x"><![CDATA[Do you want to delete the song <b>%1$s</b>?]]></string>
+    <string name="delete_x_songs"><![CDATA[Do you want to delete <b>%1$d</b> songs?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Do you want to remove the song <b>%1$s</b> from the playlist?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Do you want to remove <b>%1$d</b> songs from the playlist?]]></string>
     <string name="delete_song_title">Delete Song</string>
     <string name="delete_songs_title">Delete Songs</string>
     <string name="remove_song_from_playlist_title">Remove Song from Playlist</string>
@@ -97,9 +83,8 @@
     <string name="rename_playlist_title">Rename Playlist</string>
     <string name="delete_playlist_title">Delete Playlist</string>
     <string name="delete_playlists_title">Delete Playlists</string>
-    <string name="add_playlist_title">Add to Playlist</string>
+    <string name="add_playlist_title">"Add to Playlist"</string>
     <string name="new_playlist_title">New Playlist</string>
-
     <string name="delete_warning">"Warning: This operation can not be undone."</string>
     <string name="shuffle_all">Shuffle all</string>
     <string name="last_opened">Last opened</string>
@@ -124,14 +109,13 @@
     <string name="pref_title_force_square_album_art">Force square album art</string>
     <string name="pref_title_opaque_toolbar_now_playing">Opaque toolbar now playing</string>
     <string name="no_equalizer">No equalizer found</string>
-    <string name="no_audio_ID">No audio ID, play something and try again.</string>
+    <string name="no_audio_ID">"No audio ID, play something and try again."</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="navigation_drawer_close">"Close navigation drawer"</string>
     <string name="delete_action">Delete</string>
     <string name="remove_action">Remove</string>
     <string name="rename_action">Rename</string>
     <string name="create_action">Create</string>
-
     <string name="x_selected">%1$d selected</string>
     <string name="select">Select</string>
     <string name="default_str">Default</string>
@@ -145,23 +129,21 @@
     <string name="no_albums">No albums</string>
     <string name="no_songs">No songs</string>
     <string name="no_artists">No artists</string>
-    <string name="nothing_here">Nothing here</string>
+    <string name="empty">Empty</string>
     <string name="playlist_name">Playlist name</string>
     <string name="song">Song</string>
-    <string name="pref_only_lollipop">Only available on Lollipop.</string>
-    <string name="pref_summary_colored_album_footers">Album footers in the grid are colored with the album cover\'s palette.</string>
+    <string name="pref_only_lollipop">"Only available on Lollipop."</string>
+    <string name="pref_summary_colored_album_footers">"Album footers in the grid are colored with the album cover\'s palette."</string>
     <string name="pref_summary_force_square_album_art">Album art in the now playing view is forced to be squared.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">The toolbar in the now playing view is opaque and no longer covers the album art.</string>
-    <string name="failed_download_albumart">Unable to download the art for this album.</string>
+    <string name="failed_download_albumart">"Unable to download the art for this album."</string>
     <string name="search_hint">Search your library…</string>
     <string name="rescanning_media">Rescanning media…</string>
     <string name="other">Other</string>
-
     <string-array name="update_album_cover_options">
         <item>Download from Last.fm</item>
         <item>Pick from Local Storage</item>
         <item>Web Search</item>
         <item>Remove Cover</item>
     </string-array>
-
 </resources>