Merge branch 'soren121-sorting'

This commit is contained in:
Karim Abou Zeid 2018-04-30 13:22:53 +02:00
commit 091d0a98f4
15 changed files with 276 additions and 12 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_order_asc" type="id" />
<item name="action_album_sort_order_desc" type="id" />
<item name="action_album_sort_order_artist" type="id" />
<item name="action_album_sort_order_year" type="id" />
<item name="action_artist_sort_order_asc" type="id" />
<item name="action_artist_sort_order_desc" type="id" />
<item name="action_song_sort_order_asc" type="id" />
<item name="action_song_sort_order_desc" type="id" />
<item name="action_song_sort_order_artist" type="id" />
<item name="action_song_sort_order_album" type="id" />
<item name="action_song_sort_order_year" type="id" />
</resources>

View file

@ -297,4 +297,10 @@
<string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
<string name="action_scan_directory">Scan directory</string>
<string name="scan_media">Scan media</string>
<string name="action_sort_order">Sort order</string>
<string name="sort_order_a_z">Ascending</string>
<string name="sort_order_z_a">Descending</string>
<string name="sort_order_artist">Artist</string>
<string name="sort_order_album">Album</string>
<string name="sort_order_year">Year</string>
</resources>