Merge branch 'sorting' of https://github.com/soren121/Phonograph into soren121-sorting

This commit is contained in:
Karim Abou Zeid 2018-04-29 22:28:16 +02:00
commit ddc74f2b4b
13 changed files with 250 additions and 8 deletions

View file

@ -2,4 +2,16 @@
<resources>
<item name="action_new_playlist" type="id" />
<item name="action_show_lyrics" type="id" />
<item name="action_album_sort_asc" type="id" />
<item name="action_album_sort_desc" type="id" />
<item name="action_album_sort_artist" type="id" />
<item name="action_album_sort_year" type="id" />
<item name="action_artist_sort_asc" type="id" />
<item name="action_artist_sort_desc" type="id" />
<item name="action_song_sort_asc" type="id" />
<item name="action_song_sort_desc" type="id" />
<item name="action_song_sort_artist" type="id" />
<item name="action_song_sort_album" type="id" />
<item name="action_song_sort_year" type="id" />
</resources>

View file

@ -295,4 +295,10 @@
<string name="library_categories">Library categories</string>
<string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
<string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
<string name="action_sort">Sort order</string>
<string name="sort_a_z">Ascending</string>
<string name="sort_z_a">Descending</string>
<string name="sort_artist">Artist</string>
<string name="sort_album">Album</string>
<string name="sort_year">Year</string>
</resources>