Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/gui/audioplayer.cpp


Origin commit data
------------------
Commit: 197dfd1c41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
This commit is contained in:
vanhofen
2017-06-18 00:58:47 +02:00
8 changed files with 855 additions and 964 deletions

View File

@@ -160,8 +160,8 @@ audioplayer.add_loc Lokale Radioliste
audioplayer.add_sc SHOUTcast
audioplayer.artist_title Interpret, Titel
audioplayer.building_search_index Erstelle Suchindex
audioplayer.button_select_title_by_id Suche n. ID
audioplayer.button_select_title_by_name Suche n. Name
audioplayer.button_select_title_by_id Suche nach ID
audioplayer.button_select_title_by_name Suche nach Name
audioplayer.defdir Start-Verzeichnis
audioplayer.delete Entfernen
audioplayer.deleteall Alle entfernen