From 193fa74ab02d18624352de36c41ba85ce4d39061 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 22 Jun 2015 18:39:05 +0200
Subject: [PATCH] Synced translations, and renamed some string resources.

---
 .../dialogs/CreatePlaylistDialog.java         |   2 +-
 .../dialogs/RenamePlaylistDialog.java         |   2 +-
 .../ui/activities/AlbumDetailActivity.java    |   2 +-
 .../ui/activities/ArtistDetailActivity.java   |   2 +-
 .../ui/activities/MainActivity.java           |   3 +-
 .../ui/activities/PlaylistDetailActivity.java |   4 +-
 .../tageditor/AlbumTagEditorActivity.java     |   6 +-
 app/src/main/res/menu/menu_album_detail.xml   |   4 +-
 app/src/main/res/menu/menu_albums.xml         |   4 +-
 app/src/main/res/menu/menu_artist_detail.xml  |   4 +-
 ...nnot_delete_single_songs_playlist_song.xml |   2 +-
 .../res/menu/menu_item_playing_queue_song.xml |   2 +-
 .../main/res/menu/menu_item_playlist_song.xml |   2 +-
 app/src/main/res/menu/menu_item_song.xml      |   2 +-
 app/src/main/res/menu/menu_main.xml           |   4 +-
 .../main/res/menu/menu_media_selection.xml    |   2 +-
 .../main/res/menu/menu_playlist_detail.xml    |   4 +-
 app/src/main/res/menu/menu_playlists.xml      |   4 +-
 app/src/main/res/values-ar/strings.xml        |   4 -
 app/src/main/res/values-cs/strings.xml        |   4 -
 app/src/main/res/values-de/strings.xml        |  24 ++--
 app/src/main/res/values-el/strings.xml        |   4 -
 app/src/main/res/values-es-rES/strings.xml    |  11 +-
 app/src/main/res/values-fi/strings.xml        |   2 -
 app/src/main/res/values-fr/strings.xml        |   4 -
 app/src/main/res/values-hr/strings.xml        |   4 -
 app/src/main/res/values-it/strings.xml        |   4 -
 app/src/main/res/values-ko/strings.xml        |   4 -
 app/src/main/res/values-nl/strings.xml        |  19 +++-
 app/src/main/res/values-nn/strings.xml        |   4 -
 app/src/main/res/values-pl/strings.xml        |   4 -
 app/src/main/res/values-pt-rBR/strings.xml    |   4 -
 app/src/main/res/values-pt-rPT/strings.xml    |   1 -
 app/src/main/res/values-ro/strings.xml        |   1 -
 app/src/main/res/values-ru/strings.xml        |   4 -
 app/src/main/res/values-sv/strings.xml        |   4 -
 app/src/main/res/values-tr/strings.xml        |   4 -
 app/src/main/res/values-zh-rCN/strings.xml    |   4 -
 app/src/main/res/values-zh-rTW/strings.xml    |   4 -
 app/src/main/res/values/strings.xml           | 104 +++++++++---------
 40 files changed, 112 insertions(+), 165 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java
index 27cbe1d0..9a413090 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/CreatePlaylistDialog.java
@@ -47,7 +47,7 @@ public class CreatePlaylistDialog extends DialogFragment {
                 .inputType(InputType.TYPE_CLASS_TEXT |
                         InputType.TYPE_TEXT_VARIATION_PERSON_NAME |
                         InputType.TYPE_TEXT_FLAG_CAP_WORDS)
-                .input(R.string.playlist_name, 0, false, new MaterialDialog.InputCallback() {
+                .input(R.string.playlist_name_empty, 0, false, new MaterialDialog.InputCallback() {
                     @Override
                     public void onInput(MaterialDialog materialDialog, CharSequence charSequence) {
                         if (getActivity() == null)
diff --git a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java
index fc88b445..9fe8a416 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/dialogs/RenamePlaylistDialog.java
@@ -34,7 +34,7 @@ public class RenamePlaylistDialog extends DialogFragment {
                 .inputType(InputType.TYPE_CLASS_TEXT |
                         InputType.TYPE_TEXT_VARIATION_PERSON_NAME |
                         InputType.TYPE_TEXT_FLAG_CAP_WORDS)
-                .input(getString(R.string.playlist_name), PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId), false,
+                .input(getString(R.string.playlist_name_empty), PlaylistsUtil.getNameForPlaylist(getActivity(), playlistId), false,
                         new MaterialDialog.InputCallback() {
                             @Override
                             public void onInput(MaterialDialog materialDialog, CharSequence charSequence) {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
index 632781ed..1f12bd20 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
@@ -355,7 +355,7 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH
             case R.id.action_playing_queue:
                 NavigationUtil.openPlayingQueueDialog(this);
                 return true;
-            case R.id.action_current_playing:
+            case R.id.action_now_playing:
                 NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
                 return true;
             case R.id.action_tag_editor:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
index 69c2b86b..b148bd2c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
@@ -411,7 +411,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor
                 Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.updating), Toast.LENGTH_SHORT).show();
                 setUpArtistImageAndApplyPalette(true);
                 return true;
-            case R.id.action_current_playing:
+            case R.id.action_now_playing:
                 NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
                 return true;
         }
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
index 6bfc2c6b..c0ea88f0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java
@@ -322,6 +322,7 @@ public class MainActivity extends AbsFabActivity
 
     public void restoreActionBar() {
         ActionBar actionBar = getSupportActionBar();
+        //noinspection ConstantConditions
         actionBar.setDisplayShowTitleEnabled(true);
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setHomeButtonEnabled(true);
@@ -349,7 +350,7 @@ public class MainActivity extends AbsFabActivity
             case R.id.action_search:
                 startActivity(new Intent(MainActivity.this, SearchActivity.class));
                 return true;
-            case R.id.action_current_playing:
+            case R.id.action_now_playing:
                 NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
                 return true;
             case R.id.action_playing_queue:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
index 08b65bdd..adbc861d 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java
@@ -94,7 +94,7 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
 
             recyclerView.addItemDecoration(dragSortRecycler);
             recyclerView.addOnItemTouchListener(dragSortRecycler);
-            recyclerView.setOnScrollListener(dragSortRecycler.getScrollListener());
+            recyclerView.addOnScrollListener(dragSortRecycler.getScrollListener());
         }
         recyclerView.setAdapter(adapter);
     }
@@ -139,7 +139,7 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder
             case android.R.id.home:
                 onBackPressed();
                 return true;
-            case R.id.action_current_playing:
+            case R.id.action_now_playing:
                 NavigationUtil.openCurrentPlayingIfPossible(this, getSharedViewsWithFab(null));
                 return true;
             case R.id.action_playing_queue:
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
index 78085e6c..528d8e4b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java
@@ -104,7 +104,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                                     @Override
                                     public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
                                         Toast.makeText(AlbumTagEditorActivity.this,
-                                                R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
+                                                R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
                                     }
 
                                     @Override
@@ -121,7 +121,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                     @Override
                     public void onError() {
                         Toast.makeText(AlbumTagEditorActivity.this,
-                                R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
+                                R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
                     }
                 }
         );
@@ -190,7 +190,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text
                     @Override
                     public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
                         Toast.makeText(AlbumTagEditorActivity.this,
-                                R.string.failed_download_albumart, Toast.LENGTH_SHORT).show();
+                                R.string.failed_to_download_album_art, Toast.LENGTH_SHORT).show();
                     }
 
                     @Override
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index f8e5203a..b9ca79bf 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -4,9 +4,9 @@
       tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
 
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="ifRoom"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_albums.xml b/app/src/main/res/menu/menu_albums.xml
index db72a98f..1c3baef4 100644
--- a/app/src/main/res/menu/menu_albums.xml
+++ b/app/src/main/res/menu/menu_albums.xml
@@ -4,9 +4,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="always" />
 
     <item
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index 8e11447f..561b17e1 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -4,9 +4,9 @@
       tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
 
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="ifRoom"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
index 4f1f5e82..351f0306 100644
--- a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
@@ -39,6 +39,6 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_disk"
-        android:title="@string/action_delete_from_disk"
+        android:title="@string/action_delete_from_device"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_playing_queue_song.xml b/app/src/main/res/menu/menu_item_playing_queue_song.xml
index 10d772b4..a9269aa5 100644
--- a/app/src/main/res/menu/menu_item_playing_queue_song.xml
+++ b/app/src/main/res/menu/menu_item_playing_queue_song.xml
@@ -40,6 +40,6 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_disk"
-        android:title="@string/action_delete_from_disk"
+        android:title="@string/action_delete_from_device"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_playlist_song.xml b/app/src/main/res/menu/menu_item_playlist_song.xml
index d6f0ca69..474b07f8 100644
--- a/app/src/main/res/menu/menu_item_playlist_song.xml
+++ b/app/src/main/res/menu/menu_item_playlist_song.xml
@@ -43,6 +43,6 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_disk"
-        android:title="@string/action_delete_from_disk"
+        android:title="@string/action_delete_from_device"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_song.xml b/app/src/main/res/menu/menu_item_song.xml
index 4f1f5e82..351f0306 100644
--- a/app/src/main/res/menu/menu_item_song.xml
+++ b/app/src/main/res/menu/menu_item_song.xml
@@ -39,6 +39,6 @@
         app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_disk"
-        android:title="@string/action_delete_from_disk"
+        android:title="@string/action_delete_from_device"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index a863f5e4..2dd54564 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -4,9 +4,9 @@
       tools:context=".DrawerActivity">
 
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="always"/>
 
     <item
diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml
index f2a8ead2..9dd68de4 100644
--- a/app/src/main/res/menu/menu_media_selection.xml
+++ b/app/src/main/res/menu/menu_media_selection.xml
@@ -17,7 +17,7 @@
     <item
         android:id="@+id/action_delete_from_disk"
         android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/action_delete_from_disk"
+        android:title="@string/action_delete_from_device"
         app:showAsAction="ifRoom" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index eb30fa3e..2ec62854 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -4,9 +4,9 @@
     tools:context="com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity">
 
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="ifRoom" />
 
     <item
diff --git a/app/src/main/res/menu/menu_playlists.xml b/app/src/main/res/menu/menu_playlists.xml
index fdc187d2..67879373 100644
--- a/app/src/main/res/menu/menu_playlists.xml
+++ b/app/src/main/res/menu/menu_playlists.xml
@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/action_current_playing"
+        android:id="@+id/action_now_playing"
         android:icon="@drawable/ic_play_circle_fill_white_24dp"
-        android:title="@string/action_currently_playing"
+        android:title="@string/action_now_playing"
         app:showAsAction="always" />
 
     <item
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1b4ac78b..0b65eb51 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -3,7 +3,6 @@
     <string name="action_settings">"الإعدادات"</string>
     <string name="action_about">"   عن التطبيق
 "</string>
-    <string name="action_currently_playing">الإستماع الآن</string>
     <string name="action_playing_queue">قائمة الإنتظار</string>
     <string name="action_search">بحث</string>
     <string name="action_play_next">استمع لاحقاً</string>
@@ -11,7 +10,6 @@
     <string name="action_remove_from_playing_queue">أزل من قائمة الانتظار</string>
     <string name="action_add_to_playlist">أضف إلى قائمة تشغيل...</string>
     <string name="action_tag_editor">تعديل معلومات الملف</string>
-    <string name="action_delete_from_disk">حذف نهائي</string>
     <string name="action_details">التفاصيل</string>
     <string name="albums">الألبومات</string>
     <string name="artists">الفنانون</string>
@@ -104,11 +102,9 @@
     <string name="update_image">تحديث الصورة</string>
     <string name="playlist_empty_text">قائمة التشغيل فارغة</string>
     <string name="no_playlists">لا توجد قوائم تشغيل</string>
-    <string name="playlist_name">إسم قائمة الشغيل</string>
     <string name="song">الأغنية</string>
     <string name="pref_only_lollipop">"متوفر في نظام التشغيل Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"تلوين الهوامش السفلية للألبومات بلون غلاف الألبوم."</string>
-    <string name="failed_download_albumart">"تعذر تحميل صور هذا الألبوم."</string>
     <string name="search_hint">البحث في المكتبة...</string>
     <string name="rescanning_media">إعادة تفحص الملفات...</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1480f0ac..52023dab 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Nastavení"</string>
     <string name="action_about">O aplikaci</string>
-    <string name="action_currently_playing">Přehrávač</string>
     <string name="action_playing_queue">Fronta</string>
     <string name="action_search">Hledat</string>
     <string name="action_play_next">Další skladba</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Odebrat z fronty</string>
     <string name="action_add_to_playlist">Přidat do playlistu...</string>
     <string name="action_tag_editor">Editor Tagů</string>
-    <string name="action_delete_from_disk">Smazat soubor</string>
     <string name="action_details">Podrobnosti</string>
     <string name="albums">Alba</string>
     <string name="artists">Interpreti</string>
@@ -100,11 +98,9 @@
     <string name="update_image">Změnit obrázek</string>
     <string name="playlist_empty_text">Tento playlist je prázdný</string>
     <string name="no_playlists">Žádný playlist</string>
-    <string name="playlist_name">Jméno playlistu</string>
     <string name="song">Skladba</string>
     <string name="pref_only_lollipop">"Dostupné pouze ve verzi Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Názvy alb v mřížce jsou obarvena podle jejich obalu."</string>
-    <string name="failed_download_albumart">"Není možné stáhnout obal tohoto alba."</string>
     <string name="search_hint">Vyhledat zvukové soubory...</string>
     <string name="rescanning_media">Kontrola médií...</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2dba873e..c472c67f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -9,8 +9,8 @@
     <string name="action_share">Teilen</string>
     <string name="action_settings">"Einstellungen"</string>
     <string name="action_about">Infos</string>
-    <string name="action_currently_playing">Aktuelle Wiedergabe</string>
-    <string name="action_clear_playlist">Titel aus der Playlist löschen</string>
+    <string name="action_now_playing">Jetzt Läuft</string>
+    <string name="action_clear_playlist">Playlist leeren</string>
     <string name="action_playing_queue">Warteschlange</string>
     <string name="action_search">Suche</string>
     <string name="action_play_next">Als nächstes spielen</string>
@@ -19,7 +19,7 @@
     <string name="action_remove_from_playing_queue">Von Warteschlange entfernen</string>
     <string name="action_add_to_playlist">Zu Wiedergabeliste hinzufügen...</string>
     <string name="action_tag_editor">Tags ändern...</string>
-    <string name="action_delete_from_disk">Löschen</string>
+    <string name="action_delete_from_device">Von Gerät Löschen</string>
     <string name="action_details">Details</string>
     <string name="albums">Alben</string>
     <string name="artists">Interpreten</string>
@@ -34,7 +34,7 @@
     <string name="album">Album</string>
     <string name="artist">Interpret</string>
     <string name="genre">Genre</string>
-    <string name="album_artist">Albuminterpret</string>
+    <string name="album_artist">Album Interpret</string>
     <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>
@@ -70,7 +70,7 @@
     <string name="deleted_x_songs">%1$d Titel gelöscht</string>
     <string name="couldnot_create_playlist_x">Wiedergabeliste %1$s konnte nicht erstellt werden</string>
     <string name="delete_playlist_x"><![CDATA[Willst du die Wiedergabeliste <b>%1$s</b> löschen?]]></string>
-    <string name="clear_playlist_x"><![CDATA[Möchtest du wirklich die Titel aus der Playlist <b>%1$s</b> löschen?]]></string>
+    <string name="clear_playlist_x"><![CDATA[Möchtest du die Playlist <b>%1$s</b> wirklich leeren?]]></string>
     <string name="delete_x_playlists"><![CDATA[Willst du <b>%1$d</b> Wiedergabelisten 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>
@@ -107,10 +107,10 @@
     <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_colored_notification">Gefärbte Benachrichtigung</string>
+    <string name="pref_title_colored_notification">Farbige Benachrichtigung</string>
     <string name="pref_title_fade_play_pause">Aufbau der Musik beim spielen/stoppen</string>
-    <string name="pref_title_gapless_playback">Lückenloser Übergang</string>
-    <string name="pref_title_force_square_album_art">Quadratisches Albumcover erzwingen</string>
+    <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
+    <string name="pref_title_force_square_album_art">Quadratisches Album Cover erzwingen</string>
     <string name="pref_title_opaque_toolbar_now_playing">Undurchsichtige Toolbar</string>
     <string name="pref_title_opaque_statusbar_now_playing">Undurchsichtige Statusleiste</string>
     <string name="pref_title_larger_title_box_now_playing">Größere Titel Bar</string>
@@ -119,7 +119,7 @@
     <string name="no_equalizer">Keine Audioeffekte verfügbar</string>
     <string name="no_audio_ID">"Keine Audio ID, spiele etwas ab und versuche es erneut."</string>
     <string name="navigation_drawer_open">Navigationsdrawer öffnen</string>
-    <string name="navigation_drawer_close">"Navigationsdrawer schließen</string>
+    <string name="navigation_drawer_close">"Navigationsdrawer schließen"</string>
     <string name="delete_action">Löschen</string>
     <string name="clear_action">Löschen</string>
     <string name="remove_action">Entfernen</string>
@@ -139,7 +139,7 @@
     <string name="no_songs">Keine Songs</string>
     <string name="no_artists">Keine Interpreten</string>
     <string name="empty">Leer</string>
-    <string name="playlist_name">Name</string>
+    <string name="playlist_name_empty">Playlist name</string>
     <string name="song">Titel</string>
     <string name="pref_only_lollipop">"Nur auf Lollipop verfügbar"</string>
     <string name="pref_summary_colored_album_footers">"Farbe der Box unter jedem Album dem Cover anpassen"</string>
@@ -152,7 +152,7 @@
     <string name="pref_summary_larger_title_box_now_playing">Die Bar unter dem Album Cover wo sich der Titel und Interpret befinden ist höher.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Benutzt einen Balken als Progress Slider anstatt dem normalen Progress Slider.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Zeigt eine Karte hinter der Wiedergabesteuerung</string>
-    <string name="failed_download_albumart">"Das Cover für dieses Album konnte nicht heruntergeladen werden."</string>
+    <string name="failed_to_download_album_art">"Das Album Cover konnte nicht heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
     <string name="rescanning_media">Medien neu scannen...</string>
     <string name="favorites">Favoriten</string>
@@ -160,7 +160,7 @@
     <string name="recently_played">Zuletzt gespielt</string>
     <string name="my_top_tracks">Meine lieblings Titel</string>
     <string name="remove_cover">Titelbild entfernen</string>
-    <string name="download_from_last_fm">Herunterladen von last.fm</string>
+    <string name="download_from_last_fm">Von Last.fm herunterladen.</string>
     <string name="pick_from_local_storage">Aus lokalem Speicher wählen</string>
     <string name="web_search">Internet-Suche</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6cc1db3b..b6f645f2 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Ρυθμίσεις "</string>
     <string name="action_about">"Σχετικά "</string>
-    <string name="action_currently_playing">Παίζει τώρα</string>
     <string name="action_playing_queue">Σειρά τραγουδιών</string>
     <string name="action_search">Αναζήτηση</string>
     <string name="action_play_next">Αναπαραγωγή επόμενου</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Διαγραφή από την σειρά τραγουδιών</string>
     <string name="action_add_to_playlist">Προσθήκη στην λίστα αναπαραγωγής</string>
     <string name="action_tag_editor">Επεξεργασία ετικετών</string>
-    <string name="action_delete_from_disk">Διαγραφή απο τη συσκευή</string>
     <string name="action_details">Λεπτομέρειες</string>
     <string name="albums">Δίσκοι</string>
     <string name="artists">Καλλιτέχνες</string>
@@ -105,11 +103,9 @@
     <string name="update_image">Ανανέωση εικόνας</string>
     <string name="playlist_empty_text">Αυτή η λίστα είναι άδεια</string>
     <string name="no_playlists">Καμία λίστα</string>
-    <string name="playlist_name">Όνομα λίστας</string>
     <string name="song">Τραγούδι</string>
     <string name="pref_only_lollipop">"Διαθέσιμο μόνο σε Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Το υποσέλιδο των δίσκων στο πλέγμα χρωματίζεται με βάση την παλέττα του εξώφυλλου του δίσκου."</string>
-    <string name="failed_download_albumart">"Αδυναμία λήψης εξώφυλλου γι αυτό το δίσκο."</string>
     <string name="search_hint">Αναζήτηση στη βιβλιοθήκη...</string>
     <string name="rescanning_media">Σάρωση αρχείων πολυμέσων...</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index ac903fd8..72438c2a 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -9,7 +9,7 @@
     <string name="action_share">Compartir</string>
     <string name="action_settings">"Ajustes"</string>
     <string name="action_about">Acerca de</string>
-    <string name="action_currently_playing">Reproduciendo</string>
+    <string name="action_clear_playlist">Limpiar lista de reproducción</string>
     <string name="action_playing_queue">Cola de reproducción</string>
     <string name="action_search">Buscar</string>
     <string name="action_play_next">Siguiente</string>
@@ -17,7 +17,7 @@
     <string name="action_remove_from_playing_queue">Quitar de la cola de reproducción</string>
     <string name="action_add_to_playlist">Añadir a lista de reproducción...</string>
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_delete_from_disk">Borrar del disco</string>
+    <string name="action_delete_from_device">Eliminar del dispositivo</string>
     <string name="action_details">Detalles</string>
     <string name="albums">Álbumes</string>
     <string name="artists">Artistas</string>
@@ -135,7 +135,7 @@
     <string name="no_songs">No hay canciones</string>
     <string name="no_artists">No hay artistas</string>
     <string name="empty">Vacío</string>
-    <string name="playlist_name">Nombre de la lista de reproducción</string>
+    <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
     <string name="song">Canción</string>
     <string name="pref_only_lollipop">"Solamente disponible en Lollipop"</string>
     <string name="pref_summary_colored_album_footers">"El color pie del álbum en la cuadrícula se basa en la paleta de colores de la tapa del álbum."</string>
@@ -148,7 +148,10 @@
     <string name="pref_summary_larger_title_box_now_playing">La caja detrás de la tapa del álbum donde se encuentra el título de la canción y el artista es mas largo que su altura.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra de progreso que no cubre la tapa del álbum en vez de la barra normal de progreso.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Mostrar tarjeta detrás de los botones de control de reproducción (reproducir/pausar, etc).</string>
-    <string name="failed_download_albumart">"Imposible descargar portada del álbum"</string>
     <string name="search_hint">Buscar en librería...</string>
     <string name="rescanning_media">Escaneando contenido...</string>
+    <string name="favorites">Favoritos</string>
+    <string name="download_from_last_fm">Descargar desde Last.fm</string>
+    <string name="pick_from_local_storage">Seleccionar de almacenamiento interno</string>
+    <string name="web_search">Buscar en Internet</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1279f202..0c06e899 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Asetukset"</string>
     <string name="action_about">Tietoja</string>
-    <string name="action_currently_playing">Toistetaan nyt</string>
     <string name="action_playing_queue">Toistojono</string>
     <string name="action_search">Etsi</string>
     <string name="action_play_next">Toista seuraavaksi</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Poista jonosta</string>
     <string name="action_add_to_playlist">Lisää soittolistaan</string>
     <string name="action_tag_editor">Tagieditori</string>
-    <string name="action_delete_from_disk">Poista levyltä</string>
     <string name="action_details">Yksityiskohdat</string>
     <string name="albums">Albumit</string>
     <string name="artists">Artistit</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 73c6ec22..ad44c528 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
     <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>
     <string name="action_clear_playlist">Effacer la playlist</string>
     <string name="action_playing_queue">File de lecture</string>
     <string name="action_search">Rechercher</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">Retirer de la liste de lecture</string>
     <string name="action_add_to_playlist">Ajouter à une playlist...</string>
     <string name="action_tag_editor">Éditeur d\'infos</string>
-    <string name="action_delete_from_disk">Supprimer de l\'appareil</string>
     <string name="action_details">Détails</string>
     <string name="albums">Albums</string>
     <string name="artists">Artistes</string>
@@ -139,7 +137,6 @@
     <string name="no_songs">Aucun titre</string>
     <string name="no_artists">Aucun artiste</string>
     <string name="empty">Vide</string>
-    <string name="playlist_name">Nom de la playlist</string>
     <string name="song">Titre</string>
     <string name="pref_only_lollipop">"Uniquement disponible sur Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Les bas d\'album dans la grille sont colorés avec la palette de la vignette."</string>
@@ -152,7 +149,6 @@
     <string name="pref_summary_larger_title_box_now_playing">La boîte en dessous de la vignette de l\'album où se trouvent le titre de la musique et l\'artiste est plus large dans sa hauteur.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Utilise une barre de progression qui ne recouvre pas la vignette de l\'album à la place de la barre de progression normale.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Affiche une carte derrière les boutons de lecture (lecture/pause etc.)</string>
-    <string name="failed_download_albumart">"Impossible de télécharger la vignette 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="favorites">Favoris</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 4eb864e8..c9fdf069 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">Podijeli</string>
     <string name="action_settings">"Postavke"</string>
     <string name="action_about">O</string>
-    <string name="action_currently_playing">Trenutno se reproducira</string>
     <string name="action_playing_queue">Red čekanja</string>
     <string name="action_search">Traži</string>
     <string name="action_play_next">Reproduciraj sljedeće</string>
@@ -17,7 +16,6 @@
     <string name="action_remove_from_playing_queue">Ukloni s reda čekanja</string>
     <string name="action_add_to_playlist">Dodaj na popis pjesama...</string>
     <string name="action_tag_editor">Uređivač Tagova</string>
-    <string name="action_delete_from_disk">Obriši s lokalnog spremišta</string>
     <string name="action_details">Detalji</string>
     <string name="albums">Albumi</string>
     <string name="artists">Izvođači</string>
@@ -133,7 +131,6 @@
     <string name="no_songs">Nema pjesama</string>
     <string name="no_artists">Nema izvođača</string>
     <string name="empty">Prazno</string>
-    <string name="playlist_name">Ime popisa pjesama</string>
     <string name="song">Pjesma</string>
     <string name="pref_only_lollipop">"Dostupno samo na Lollipopu."</string>
     <string name="pref_summary_colored_album_footers">"Podnožje albuma u rešetci je obojano istaknutom bojom omota albuma."</string>
@@ -146,7 +143,6 @@
     <string name="pref_summary_larger_title_box_now_playing">Okvir ispod omota albuma gdje su prikazani naslov pjesme i izvođač je viši.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Koristi se traka napretka koja ne prekriva omot albuma umjesto uobičajenog klizača.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Prikazuje karticu ispod gumbića koji služe za kontrolu reprodukcije (pokreni/pauziraj itd.).</string>
-    <string name="failed_download_albumart">"Nije bilo moguće skinuti omot albuma."</string>
     <string name="search_hint">Pretraži fonoteku...</string>
     <string name="rescanning_media">Ponovno skeniram medijske datoteke...</string>
     <string name="favorites">Favoriti</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7b95624b..bdccb78a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">Condividi</string>
     <string name="action_settings">"Impostazioni"</string>
     <string name="action_about">Informazioni</string>
-    <string name="action_currently_playing">In riproduzione</string>
     <string name="action_clear_playlist">Svuota playlist</string>
     <string name="action_playing_queue">Brani in coda</string>
     <string name="action_search">Cerca</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">Rimuovi dalla coda</string>
     <string name="action_add_to_playlist">Aggiungi alla playlist</string>
     <string name="action_tag_editor">Modifica tag</string>
-    <string name="action_delete_from_disk">Elimina dal dispositivo</string>
     <string name="action_details">Dettagli</string>
     <string name="albums">Album</string>
     <string name="artists">Artisti</string>
@@ -139,7 +137,6 @@
     <string name="no_songs">Nessun brano</string>
     <string name="no_artists">Nessun artista</string>
     <string name="empty">Vuoto</string>
-    <string name="playlist_name">Nome playlist</string>
     <string name="song">Brano</string>
     <string name="pref_only_lollipop">"Disponibile solo su Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"I riquadri degli album nella griglia sono colorati secondo la gamma di colori della copertina."</string>
@@ -152,7 +149,6 @@
     <string name="pref_summary_larger_title_box_now_playing">Il riquadro al di sotto della copertina in cui sono visualizzati il titolo del brano e l\'artista è più grande in altezza.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra di scorrimento che non copre la copertina invece del normale cursore.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Visualizza un contorno in stile card dietro i controlli di riproduzione (play, pausa ecc.).</string>
-    <string name="failed_download_albumart">"Impossibile scaricare la copertina per quest\'album."</string>
     <string name="search_hint">Cerca nella tua libreria...</string>
     <string name="rescanning_media">Nuova scannerizzazione media in corso...</string>
     <string name="favorites">Preferiti</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 64121312..ed752d45 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">공유</string>
     <string name="action_settings">"설정"</string>
     <string name="action_about">정보</string>
-    <string name="action_currently_playing">지금 재생 중</string>
     <string name="action_clear_playlist">재생목록 비우기</string>
     <string name="action_playing_queue">재생 대기열</string>
     <string name="action_search">검색</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">재생 대기열에서 제거</string>
     <string name="action_add_to_playlist">재생목록에 추가...</string>
     <string name="action_tag_editor">태그 편집기</string>
-    <string name="action_delete_from_disk">저장소에서 제거</string>
     <string name="action_details">세부정보</string>
     <string name="albums">앨범</string>
     <string name="artists">아티스트</string>
@@ -140,7 +138,6 @@
     <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>
@@ -153,7 +150,6 @@
     <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="failed_download_albumart">"이 앨범의 앨범 커버를 다운로드할 수 없습니다."</string>
     <string name="search_hint">저장소 검색...</string>
     <string name="rescanning_media">미디어 재스캐닝 중...</string>
     <string name="favorites">좋아하는 곡들</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e7ee3d4f..a2268747 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -9,15 +9,15 @@
     <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>
+    <string name="action_clear_playlist">Afspeellijst vrijmaken</string>
     <string name="action_playing_queue">Afspeelwachtrij</string>
     <string name="action_search">Zoeken</string>
     <string name="action_play_next">Afspelen als volgende</string>
+    <string name="action_play">Afspelen</string>
     <string name="action_add_to_playing_queue">Toevoegen aan wachtrij</string>
     <string name="action_remove_from_playing_queue">Verwijderen uit wachtrij</string>
     <string name="action_add_to_playlist">Toevoegen aan afspeellijst...</string>
     <string name="action_tag_editor">Label bewerker</string>
-    <string name="action_delete_from_disk">Verwijderen van apparaat</string>
     <string name="action_details">Details</string>
     <string name="albums">Albums</string>
     <string name="artists">Artiesten</string>
@@ -65,8 +65,10 @@
     <string name="inserted_x_songs_into_playlist">%1$d nummers toegevoegd aan de afspeellijst.</string>
     <string name="created_playlist_x">Afspeellijst %1$s aangemaakt</string>
     <string name="deleted_playlist_x">Afspeellijst %1$s verwijderd</string>
+    <string name="deleted_x_songs">%1$d nummers verwijderd</string>
     <string name="couldnot_create_playlist_x">Kon afspeellijst %1$s niet aanmaken</string>
     <string name="delete_playlist_x"><![CDATA[Wil je de afspeellijst <b>%1$s</b> verwijderen?]]></string>
+    <string name="clear_playlist_x"><![CDATA[Weet je zeker dat je de afspeellijst <b>%1$s</b> wilt vrijmaken? Dit kan niet ongedaan gemaakt worden!]]></string>
     <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>
@@ -79,6 +81,7 @@
     <string name="rename_playlist_title">Hernoem afspeellijst</string>
     <string name="delete_playlist_title">Verwijder afspeellijst</string>
     <string name="delete_playlists_title">Verwijder afspeellijst</string>
+    <string name="clear_playlist_title">Afspeellijst vrijmaken</string>
     <string name="add_playlist_title">"Toevoegen aan afspeellijst"</string>
     <string name="new_playlist_title">Nieuwe afspeellijst</string>
     <string name="delete_warning">"Waarschuwing: Deze handeling kan niet ongedaan gemaakt worden."</string>
@@ -116,6 +119,7 @@
     <string name="navigation_drawer_open">Open navigatiebalk</string>
     <string name="navigation_drawer_close">"Sluit navigatiebalk"</string>
     <string name="delete_action">Verwijderen</string>
+    <string name="clear_action">Vrijmaken</string>
     <string name="remove_action">Verwijderen</string>
     <string name="rename_action">Hernoemen</string>
     <string name="create_action">Aanmaken</string>
@@ -133,7 +137,6 @@
     <string name="no_songs">Geen nummers</string>
     <string name="no_artists">Geen artiesten</string>
     <string name="empty">Leeg</string>
-    <string name="playlist_name">Afspeellijstnaam</string>
     <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>
@@ -144,12 +147,16 @@
     <string name="pref_summary_opaque_toolbar_now_playing">De werkbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">De statusbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
     <string name="pref_summary_larger_title_box_now_playing">De kader onder de albumhoes, waar de artiest en titel worden getoond, is groter.</string>
-    <string name="pref_summary_alternative_progress_slider_now_playing">Gebruikt een progressiebalk die de albumhoes niet bedekt, in plaats van de normale progressiecirkel.</string>
-    <string name="pref_summary_playback_controller_card_now_playing">Weergeeft een kaart onder de bedieningsknoppen (afspelen/pauze etc.)</string>
-    <string name="failed_download_albumart">"Het lukt niet om de albumhoes te downloaden. "</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Gebruik een progressiebalk die de albumhoes niet bedekt, in plaats van de standaard progressiecirkel.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Weergeeft een kaart onder de bedieningsknoppen (afspelen/pauze etc.).</string>
     <string name="search_hint">Zoek in je bibliotheek...</string>
     <string name="rescanning_media">Media herscannen...</string>
     <string name="favorites">Favorieten</string>
+    <string name="last_added">Laatst toegevoegd</string>
     <string name="recently_played">Recent afgespeeld</string>
     <string name="my_top_tracks">Mijn top nummers</string>
+    <string name="remove_cover">Verwijder albumhoes</string>
+    <string name="download_from_last_fm">Download van last.fm</string>
+    <string name="pick_from_local_storage">Kies uit lokale opslag</string>
+    <string name="web_search">Zoek op het web</string>
 </resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index ed13ec05..786dcec6 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Innstillingar"</string>
     <string name="action_about">Om</string>
-    <string name="action_currently_playing">Spelar no</string>
     <string name="action_playing_queue">Songkø</string>
     <string name="action_search">Søk</string>
     <string name="action_play_next">Spel som neste</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Fjern frå køen</string>
     <string name="action_add_to_playlist">Legg til i speleliste...</string>
     <string name="action_tag_editor">Tag Editor</string>
-    <string name="action_delete_from_disk">Slett frå disk</string>
     <string name="action_details">Detaljar</string>
     <string name="albums">Album</string>
     <string name="artists">Artistar</string>
@@ -108,10 +106,8 @@
     <string name="update_image">Oppdater bilete</string>
     <string name="playlist_empty_text">Spelelista er tom</string>
     <string name="no_playlists">Ingen spelelister</string>
-    <string name="playlist_name">Spelelistenamn</string>
     <string name="song">Song</string>
     <string name="pref_only_lollipop">"Berre tilgjengeleg på Lollipop."</string>
-    <string name="failed_download_albumart">"Ikkje i stand til å laste ned omslagsbilete til dette albumet."</string>
     <string name="search_hint">Søk i biblioteket...</string>
     <string name="rescanning_media">Skanner media på nytt...</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e75ed983..bffc8bc1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">Udostępnij</string>
     <string name="action_settings">"Ustawienia"</string>
     <string name="action_about">O aplikacji</string>
-    <string name="action_currently_playing">Teraz gra</string>
     <string name="action_clear_playlist">Wyczyść listę odtwarzania</string>
     <string name="action_playing_queue">Kolejka odtwarzania</string>
     <string name="action_search">Szukaj</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">Usuń z kolejki odtwarzania</string>
     <string name="action_add_to_playlist">Dodaj do listy odtwarzania...</string>
     <string name="action_tag_editor">Edytor tagów</string>
-    <string name="action_delete_from_disk">Usuń z urządzenia</string>
     <string name="action_details">Szczegóły</string>
     <string name="albums">Albumy</string>
     <string name="artists">Wykonawcy</string>
@@ -139,7 +137,6 @@
     <string name="no_songs">Brak utworów</string>
     <string name="no_artists">Brak wykonawców</string>
     <string name="empty">Pusto</string>
-    <string name="playlist_name">Nazwa listy odtwarzania</string>
     <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>
@@ -152,7 +149,6 @@
     <string name="pref_summary_larger_title_box_now_playing">Zaznacz, a pole nazwy utworu i wykonawcy pod okładką albumu będzie większe</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Zaznacz, a w odróżnieniu od domyślnego suwaka, pasek postępu nie zasłoni okładki albumu</string>
     <string name="pref_summary_playback_controller_card_now_playing">Zaznacz, a pod przyciskami sterującymi odtwarzaczem (odtwarzanie/pauza, itp.) zostanie wyświetlona karta</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>
     <string name="favorites">Ulubione</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 9f2e41d3..fd8485ac 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">Compartilhar</string>
     <string name="action_settings">"Configurações"</string>
     <string name="action_about">Sobre</string>
-    <string name="action_currently_playing">Em execução</string>
     <string name="action_clear_playlist">Limpar playlist</string>
     <string name="action_playing_queue">Fila de execução</string>
     <string name="action_search">Pesquisar</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">Remover da fila atual</string>
     <string name="action_add_to_playlist">Adicionar à playlist...</string>
     <string name="action_tag_editor">Editor de tags</string>
-    <string name="action_delete_from_disk">Apagar</string>
     <string name="action_details">Detalhes</string>
     <string name="albums">Álbuns</string>
     <string name="artists">Artistas</string>
@@ -139,7 +137,6 @@
     <string name="no_songs">Nenhuma Musica</string>
     <string name="no_artists">Nenhum Artista</string>
     <string name="empty">Vazio</string>
-    <string name="playlist_name">Nome da playlist</string>
     <string name="song">Música</string>
     <string name="pref_only_lollipop">"Apenas disponível no Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Rodapés de álbum na grade são coloridos com as paletas correspondentes."</string>
@@ -152,7 +149,6 @@
     <string name="pref_summary_larger_title_box_now_playing">A caixa embaixo da capa do álbum onde o titulo da musica e o artista são mostrados é mais largo na sua altura.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Usa uma barra de progresso que não cobre a capa do álbum substituindo a barra padrão.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Mostra um cartão abaixo dos controles de reprodução (tocar/pausar etc.)</string>
-    <string name="failed_download_albumart">"Não foi possível fazer o download da arte para este álbum."</string>
     <string name="search_hint">Pesquisar na sua biblioteca...</string>
     <string name="rescanning_media">Verificando mídia novamente...</string>
     <string name="favorites">Favoritos</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ce1c2b32..b20af658 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Remover da fila</string>
     <string name="action_add_to_playlist">Adicionar à playlist...</string>
     <string name="action_tag_editor">Editor de tags</string>
-    <string name="action_delete_from_disk">Excluir da memória</string>
     <string name="action_details">Detalhes</string>
     <string name="albums">Álbuns</string>
     <string name="artists">Artistas</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 5279a344..f35ae812 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Șterge din lista de melodii</string>
     <string name="action_add_to_playlist">Adaugă in playlist</string>
     <string name="action_tag_editor">Editor Info Melodie</string>
-    <string name="action_delete_from_disk">Șterge</string>
     <string name="action_details">Detalii</string>
     <string name="albums">Albume</string>
     <string name="artists">Artiști</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 187b3044..5448c506 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Настройки"</string>
     <string name="action_about">О программе</string>
-    <string name="action_currently_playing">Сейчас проигрывается</string>
     <string name="action_playing_queue">Очередь воспроизведения</string>
     <string name="action_search">Поиск</string>
     <string name="action_play_next">Проиграть следующую</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Удалить из очереди воспроизведения</string>
     <string name="action_add_to_playlist">Добавить в список воспроизведения...</string>
     <string name="action_tag_editor">Редактор тэгов</string>
-    <string name="action_delete_from_disk">Удалить с диска</string>
     <string name="action_details">Подробнее</string>
     <string name="albums">Альбомы</string>
     <string name="artists">Исполнители</string>
@@ -105,11 +103,9 @@
     <string name="update_image">Обновить изображение</string>
     <string name="playlist_empty_text">Список воспроизведения пуст</string>
     <string name="no_playlists">Нет списков воспроизведения</string>
-    <string name="playlist_name">Имя списка воспроизведения</string>
     <string name="song">Песня</string>
     <string name="pref_only_lollipop">"Доступно только для Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Панели альбомов в сетке окрашены цветом из палитры обложки альбома."</string>
-    <string name="failed_download_albumart">"Невозможно загрузить обложку для этого альбома."</string>
     <string name="search_hint">Поиск библиотеки...</string>
     <string name="rescanning_media">Повторное сканирование медиа...</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b150f676..cca48e08 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">"Inställningar"</string>
     <string name="action_about">Information</string>
-    <string name="action_currently_playing">Spelas just nu</string>
     <string name="action_playing_queue">Uppspelningskö</string>
     <string name="action_search">Sök</string>
     <string name="action_play_next">Spela som nästa</string>
@@ -10,7 +9,6 @@
     <string name="action_remove_from_playing_queue">Ta bort från uppspelningskön</string>
     <string name="action_add_to_playlist">Lägg till spellista</string>
     <string name="action_tag_editor">Tagredigering</string>
-    <string name="action_delete_from_disk">Radera från skiva</string>
     <string name="action_details">Detaljer</string>
     <string name="albums">Album</string>
     <string name="artists">Artister</string>
@@ -98,10 +96,8 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="update_image">Uppdatera bild</string>
     <string name="playlist_empty_text">Spellistan är tom</string>
     <string name="no_playlists">Inga spellistor</string>
-    <string name="playlist_name">Spellistans namn</string>
     <string name="song">Låt</string>
     <string name="pref_only_lollipop">"Enbart tillgänglig för Lollipop."</string>
-    <string name="failed_download_albumart">"Kan inte ladda ner bild för detta album."</string>
     <string name="search_hint">Sök i ditt bibliotek ...</string>
     <string name="rescanning_media">Återskannar media ...</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 282b2358..51623b3a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">Paylaş</string>
     <string name="action_settings">"Ayarlar"</string>
     <string name="action_about">Hakkında</string>
-    <string name="action_currently_playing">Şu anda çalınan</string>
     <string name="action_clear_playlist">Çalma listesini temizle</string>
     <string name="action_playing_queue">Çalma Sırası</string>
     <string name="action_search">Ara</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">Çalma sırasından çıkar</string>
     <string name="action_add_to_playlist">Çalma listesine ekle</string>
     <string name="action_tag_editor">Etiket düzenleyici</string>
-    <string name="action_delete_from_disk">Bellekten sil</string>
     <string name="action_details">Detaylar</string>
     <string name="albums">Albümler</string>
     <string name="artists">Sanatçılar</string>
@@ -139,7 +137,6 @@
     <string name="no_songs">Şarkı yok</string>
     <string name="no_artists">Sanatcı yok</string>
     <string name="empty">Boş</string>
-    <string name="playlist_name">Çalma listesi adı</string>
     <string name="song">Şarkı</string>
     <string name="pref_only_lollipop">"Sadece Lollipop için"</string>
     <string name="pref_summary_colored_album_footers">"Izgara içindeki albüm alt bilgisi albüm arkaplanı canlı renklerle renklendirildi."</string>
@@ -152,7 +149,6 @@
     <string name="pref_summary_larger_title_box_now_playing">Şarkı başlığı ve sanatçıya giden albüm kapağı altındaki kutusunun yüksekliğini büyültür.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Varsayılan ilerleme sürgüsü yerine albüm kapağı içermeyen bir ilerleme çubuğu kullanılır.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Oynatma kontrol düğmelerinin altında bir kart görüntüler (oynat/duraklatma, vb).</string>
-    <string name="failed_download_albumart">"Bu albüm için kapak indirilemiyor."</string>
     <string name="search_hint">Kütüphaneniz taranıyor...</string>
     <string name="rescanning_media">Medyayı yeniden tara</string>
     <string name="favorites">Favoriler</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d8c88f53..f1cad0ec 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">分享</string>
     <string name="action_settings">"设置"</string>
     <string name="action_about">关于</string>
-    <string name="action_currently_playing">正在播放</string>
     <string name="action_clear_playlist">清除播放列表</string>
     <string name="action_playing_queue">播放列表</string>
     <string name="action_search">搜索</string>
@@ -19,7 +18,6 @@
     <string name="action_remove_from_playing_queue">从播放队列移除</string>
     <string name="action_add_to_playlist">加入播放列表</string>
     <string name="action_tag_editor">音乐标签编辑器</string>
-    <string name="action_delete_from_disk">从sd卡上删除</string>
     <string name="action_details">详情</string>
     <string name="albums">专辑</string>
     <string name="artists">艺术家</string>
@@ -139,7 +137,6 @@
     <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">"仅适用于 Lollipop"</string>
     <string name="pref_summary_colored_album_footers">"专辑队列视图中专辑页脚会根据专辑封面的色调进行变色。"</string>
@@ -152,7 +149,6 @@
     <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="failed_download_albumart">"专辑信息下载失败"</string>
     <string name="search_hint">正在扫描</string>
     <string name="rescanning_media">正在重新扫描媒体库…</string>
     <string name="favorites">收藏夹</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index baa7e0b0..745b942c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,7 +9,6 @@
     <string name="action_share">分享</string>
     <string name="action_settings">"設定"</string>
     <string name="action_about">關於</string>
-    <string name="action_currently_playing">正在播放</string>
     <string name="action_playing_queue">播放佇列</string>
     <string name="action_search">搜尋</string>
     <string name="action_play_next">稍後播放</string>
@@ -17,7 +16,6 @@
     <string name="action_remove_from_playing_queue">從播放佇列移除</string>
     <string name="action_add_to_playlist">加入音樂清單…</string>
     <string name="action_tag_editor">編輯音樂標籤</string>
-    <string name="action_delete_from_disk">從本裝置刪除</string>
     <string name="action_details">詳細資訊</string>
     <string name="albums">專輯</string>
     <string name="artists">歌手</string>
@@ -119,13 +117,11 @@
     <string name="update_image">更新圖片</string>
     <string name="playlist_empty_text">這個音樂清單是空的</string>
     <string name="no_playlists">無音樂清單</string>
-    <string name="playlist_name">音樂清單名稱</string>
     <string name="song">歌曲</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>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0e2ca358..69653d43 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,24 +2,24 @@
 <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>
+    <string name="the_audio_file">The Audio File</string>
     <string name="do_you_want_to_set_x_as_ringtone">Do you want to set %1$s as your ringtone?</string>
     <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_set_as_ringtone">Set as Ringtone</string>
     <string name="action_share">Share</string>
     <string name="action_settings">"Settings"</string>
     <string name="action_about">About</string>
-    <string name="action_currently_playing">Currently playing</string>
-    <string name="action_clear_playlist">Clear playlist</string>
-    <string name="action_playing_queue">Playing queue</string>
+    <string name="action_now_playing">Now Playing</string>
+    <string name="action_clear_playlist">Clear Playlist</string>
+    <string name="action_playing_queue">Playing Queue</string>
     <string name="action_search">Search</string>
-    <string name="action_play_next">Play next</string>
+    <string name="action_play_next">Play Next</string>
     <string name="action_play">Play</string>
-    <string name="action_add_to_playing_queue">Add to playing queue</string>
-    <string name="action_remove_from_playing_queue">Remove from playing queue</string>
-    <string name="action_add_to_playlist">Add to playlist…</string>
+    <string name="action_add_to_playing_queue">Add to Playing Queue</string>
+    <string name="action_remove_from_playing_queue">Remove from Playing Queue</string>
+    <string name="action_add_to_playlist">Add to Playlist…</string>
     <string name="action_tag_editor">Tag Editor</string>
-    <string name="action_delete_from_disk">Delete from disk</string>
+    <string name="action_delete_from_device">Delete from Device</string>
     <string name="action_details">Details</string>
     <string name="albums">Albums</string>
     <string name="artists">Artists</string>
@@ -30,11 +30,11 @@
     <string name="biography_unavailable">We were not able to find a matching biography for this artist.</string>
     <string name="biography">Biography</string>
     <string name="audio_focus_denied">No audio focus.</string>
-    <string name="tag_editor">Tag editor</string>
+    <string name="tag_editor">Tag Editor</string>
     <string name="album">Album</string>
     <string name="artist">Artist</string>
     <string name="genre">Genre</string>
-    <string name="album_artist">Album artist</string>
+    <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>
@@ -43,16 +43,16 @@
     <string name="saving_changes">Saving changes…</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
+    <string name="label_file_path">File Path</string>
     <string name="label_file_size">Size</string>
     <string name="label_file_format">Format</string>
     <string name="label_track_length">Length</string>
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="action_go_to_artist">Go to artist</string>
-    <string name="action_go_to_album">Go to album</string>
-    <string name="label_current_playing_queue">Playing queue</string>
-    <string name="save_as_playlist">Save as playlist</string>
+    <string name="label_sampling_rate">Sampling Rate</string>
+    <string name="action_go_to_artist">Go to Artist</string>
+    <string name="action_go_to_album">Go to Album</string>
+    <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="no_results">No results</string>
@@ -87,39 +87,39 @@
     <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>
+    <string name="shuffle_all">Shuffle All</string>
+    <string name="last_opened">Last Opened</string>
     <string name="light_theme_name">Light</string>
     <string name="dark_theme_name">Dark</string>
     <string name="equalizer">Equalizer</string>
     <string name="pref_header_colors">Colors</string>
-    <string name="pref_header_now_playing_screen">Now playing screen</string>
-    <string name="pref_title_general_theme">General theme</string>
+    <string name="pref_header_now_playing_screen">Now Playing Screen</string>
+    <string name="pref_title_general_theme">General Theme</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">General</string>
     <string name="pref_summary_colored_navigation_bar">In which views the navigation bar should be colored.</string>
-    <string name="pref_title_navigation_bar">Colored navigation bar</string>
-    <string name="pref_title_set_default_start_page">Start page</string>
-    <string name="pref_title_colored_navigation_bar_artists">Artist view</string>
-    <string name="pref_title_colored_navigation_bar_albums">Album view</string>
-    <string name="pref_title_colored_navigation_bar_current_playing">Playing view</string>
-    <string name="pref_title_colored_navigation_bar_playlists">Playlist view</string>
-    <string name="pref_title_colored_navigation_bar_tag_editor">Tag editor</string>
-    <string name="pref_title_colored_navigation_bar_other_screens">Everywhere else</string>
-    <string name="pref_title_colored_album_footers">Colored album footers</string>
-    <string name="pref_title_colored_notification">Colored notification</string>
-    <string name="pref_title_fade_play_pause">Fade play/pause</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_force_square_album_art">Force square album art</string>
-    <string name="pref_title_opaque_toolbar_now_playing">Opaque toolbar</string>
-    <string name="pref_title_opaque_statusbar_now_playing">Opaque statusbar</string>
-    <string name="pref_title_larger_title_box_now_playing">Larger title box</string>
-    <string name="pref_title_alternative_progress_slider_now_playing">Alternative progress slider</string>
-    <string name="pref_title_playback_controller_card_now_playing">Show card below playback controllers</string>
-    <string name="no_equalizer">No equalizer found</string>
+    <string name="pref_title_navigation_bar">Colored Navigation Bar</string>
+    <string name="pref_title_set_default_start_page">Start Page</string>
+    <string name="pref_title_colored_navigation_bar_artists">Artist View</string>
+    <string name="pref_title_colored_navigation_bar_albums">Album View</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Playing View</string>
+    <string name="pref_title_colored_navigation_bar_playlists">Playlist View</string>
+    <string name="pref_title_colored_navigation_bar_tag_editor">Tag Editor</string>
+    <string name="pref_title_colored_navigation_bar_other_screens">Everywhere Else</string>
+    <string name="pref_title_colored_album_footers">Colored Album Footers</string>
+    <string name="pref_title_colored_notification">Colored Notification</string>
+    <string name="pref_title_fade_play_pause">Fade Play/Pause</string>
+    <string name="pref_title_gapless_playback">Gapless Playback</string>
+    <string name="pref_title_force_square_album_art">Force Square Album Cover</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Opaque Toolbar</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Opaque Statusbar</string>
+    <string name="pref_title_larger_title_box_now_playing">Larger Title Box</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternative Progress Slider</string>
+    <string name="pref_title_playback_controller_card_now_playing">Show Card below Playback Controllers</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="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">"Close navigation drawer"</string>
+    <string name="navigation_drawer_open">Open Navigation Drawer</string>
+    <string name="navigation_drawer_close">"Close Navigation Drawer"</string>
     <string name="delete_action">Delete</string>
     <string name="clear_action">Clear</string>
     <string name="remove_action">Remove</string>
@@ -139,7 +139,7 @@
     <string name="no_songs">No songs</string>
     <string name="no_artists">No artists</string>
     <string name="empty">Empty</string>
-    <string name="playlist_name">Playlist name</string>
+    <string name="playlist_name_empty">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 vibrant color."</string>
@@ -152,15 +152,15 @@
     <string name="pref_summary_larger_title_box_now_playing">The box below the album art where the song title and artist goes is larger in its height.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Uses a progressbar which does not cover the album art instead of the default progress slider.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Displays a card below the playback controller buttons (play/pause etc.).</string>
-    <string name="failed_download_albumart">"Unable to download the art for this album."</string>
+    <string name="failed_to_download_album_art">"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="favorites">Favorites</string>
-    <string name="last_added">Last added</string>
-    <string name="recently_played">Recently played</string>
-    <string name="my_top_tracks">My top tracks</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="download_from_last_fm">Download from last.fm</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="web_search">Web search</string>
+    <string name="last_added">Last Added</string>
+    <string name="recently_played">Recently Played</string>
+    <string name="my_top_tracks">My Top Tracks</string>
+    <string name="remove_cover">Remove Cover</string>
+    <string name="download_from_last_fm">Download from Last.fm</string>
+    <string name="pick_from_local_storage">Pick from Local Storage</string>
+    <string name="web_search">Web Search</string>
 </resources>