Merge branch 'search' into dev

This commit is contained in:
Christian Schabesberger 2018-07-19 16:19:33 +02:00
commit 07ecf2b088
18 changed files with 428 additions and 267 deletions

View file

@ -125,7 +125,12 @@
<string name="error_report_title">Error report</string>
<string name="all">All</string>
<string name="channel">Channel</string>
<string name="channels">Channels</string>
<string name="playlist">Playlist</string>
<string name="playlists">Playlists</string>
<string name="videos">Videos</string>
<string name="tracks">Tracks</string>
<string name="users">Users</string>
<string name="yes">Yes</string>
<string name="later">Later</string>
<string name="disabled">Disabled</string>