From 4c59fc24866916a9bba434a5d9c76ea353c918fa Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Wed, 8 Feb 2017 18:41:08 +0100
Subject: [PATCH] Use 'title' instead of 'name'

---
 res/values/translatable.xml                            |  2 +-
 src/ch/blinkenlights/android/vanilla/MediaAdapter.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index 304e3b54..47d61b59 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -120,7 +120,7 @@ THE SOFTWARE.
 	<string name="more_from_artist">More from artist</string>
 	<string name="more_from_album">More from album</string>
 
-	<string name="name">Name</string>
+	<string name="title">Title</string>
 	<string name="number_of_tracks">Number of tracks</string>
 	<string name="year">Year</string>
 	<string name="date_added">Date added</string>
diff --git a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
index 7ef12125..27774ce1 100644
--- a/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
+++ b/src/ch/blinkenlights/android/vanilla/MediaAdapter.java
@@ -186,14 +186,14 @@ public class MediaAdapter
 			mSource = MediaLibrary.VIEW_ARTISTS;
 			mFields = new String[] { MediaLibrary.ContributorColumns.ARTIST };
 			mFieldKeys = new String[] { MediaLibrary.ContributorColumns.ARTIST_SORT };
-			mSortEntries = new int[] { R.string.name, R.string.date_added };
+			mSortEntries = new int[] { R.string.title, R.string.date_added };
 			mAdapterSortValues = new String[] { MediaLibrary.ContributorColumns.ARTIST_SORT+" %1$s", MediaLibrary.ContributorColumns.MTIME+" %1$s" };
 			break;
 		case MediaUtils.TYPE_ALBUM:
 			mSource = MediaLibrary.VIEW_ALBUMS_ARTISTS;
 			mFields = new String[] { MediaLibrary.AlbumColumns.ALBUM, MediaLibrary.ContributorColumns.ARTIST };
 			mFieldKeys = new String[] { MediaLibrary.AlbumColumns.ALBUM_SORT, MediaLibrary.ContributorColumns.ARTIST_SORT };
-			mSortEntries = new int[] { R.string.name, R.string.artist_album, R.string.year, R.string.date_added };
+			mSortEntries = new int[] { R.string.title, R.string.artist_album, R.string.year, R.string.date_added };
 			mAdapterSortValues = new String[] { MediaLibrary.AlbumColumns.ALBUM_SORT+" %1$s", MediaLibrary.ContributorColumns.ARTIST_SORT+" %1$s,"+MediaLibrary.AlbumColumns.ALBUM_SORT+" %1$s",
 			                                    MediaLibrary.AlbumColumns.PRIMARY_ALBUM_YEAR+" %1$s", MediaLibrary.AlbumColumns.MTIME+" %1$s" };
 			break;
@@ -201,7 +201,7 @@ public class MediaAdapter
 			mSource = MediaLibrary.VIEW_SONGS_ALBUMS_ARTISTS;
 			mFields = new String[] { MediaLibrary.SongColumns.TITLE, MediaLibrary.AlbumColumns.ALBUM, MediaLibrary.ContributorColumns.ARTIST };
 			mFieldKeys = new String[] { MediaLibrary.SongColumns.TITLE_SORT, MediaLibrary.AlbumColumns.ALBUM_SORT, MediaLibrary.ContributorColumns.ARTIST_SORT };
-			mSortEntries = new int[] { R.string.name, R.string.artist_album_track, R.string.artist_album_title, R.string.album_track, R.string.year, R.string.date_added, R.string.song_playcount };
+			mSortEntries = new int[] { R.string.title, R.string.artist_album_track, R.string.artist_album_title, R.string.album_track, R.string.year, R.string.date_added, R.string.song_playcount };
 			mAdapterSortValues = new String[] { MediaLibrary.SongColumns.TITLE_SORT+" %1$s",
 			                                    MediaLibrary.ContributorColumns.ARTIST_SORT+" %1$s,"+MediaLibrary.AlbumColumns.ALBUM_SORT+" %1$s,"+MediaLibrary.SongColumns.DISC_NUMBER+","+MediaLibrary.SongColumns.SONG_NUMBER,
 			                                    MediaLibrary.ContributorColumns.ARTIST_SORT+" %1$s,"+MediaLibrary.AlbumColumns.ALBUM_SORT+" %1$s,"+MediaLibrary.SongColumns.TITLE_SORT+" %1$s",
@@ -218,7 +218,7 @@ public class MediaAdapter
 			mSource = MediaLibrary.TABLE_PLAYLISTS;
 			mFields = new String[] { MediaLibrary.PlaylistColumns.NAME };
 			mFieldKeys = null;
-			mSortEntries = new int[] { R.string.name, R.string.date_added };
+			mSortEntries = new int[] { R.string.title, R.string.date_added };
 			mAdapterSortValues = new String[] { MediaLibrary.PlaylistColumns.NAME+" %1$s", MediaLibrary.PlaylistColumns._ID+" %1$s" };
 			mExpandable = true;
 			break;
@@ -226,7 +226,7 @@ public class MediaAdapter
 			mSource = MediaLibrary.TABLE_GENRES;
 			mFields = new String[] { MediaLibrary.GenreColumns._GENRE };
 			mFieldKeys = new String[] { MediaLibrary.GenreColumns._GENRE_SORT };
-			mSortEntries = new int[] { R.string.name };
+			mSortEntries = new int[] { R.string.title };
 			mAdapterSortValues = new String[] { MediaLibrary.GenreColumns._GENRE_SORT+" %1$s" };
 			break;
 		default: