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

Origin commit data
------------------
Branch: ni/coolstream
Commit: d8dad4f7ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-28 23:09:54 +02:00
2 changed files with 4 additions and 4 deletions

View File

@@ -655,7 +655,7 @@ filebrowser.filter.inactive Filter aus
filebrowser.head Dateibrowser filebrowser.head Dateibrowser
filebrowser.mark Markieren filebrowser.mark Markieren
filebrowser.nextpage Seite vor filebrowser.nextpage Seite vor
filebrowser.pm Playlist Manager filebrowser.pm Playlist-Manager
filebrowser.prevpage Seite zurück filebrowser.prevpage Seite zurück
filebrowser.scan Durchsuche Verzeichnisse filebrowser.scan Durchsuche Verzeichnisse
filebrowser.select Auswählen filebrowser.select Auswählen

View File

@@ -653,9 +653,9 @@ filebrowser.filter.active Filter on
filebrowser.filter.inactive Filter off filebrowser.filter.inactive Filter off
filebrowser.head Filebrowser filebrowser.head Filebrowser
filebrowser.mark Mark filebrowser.mark Mark
filebrowser.nextpage Next Page filebrowser.nextpage Next page
filebrowser.pm Playlist Manager filebrowser.pm Playlist manager
filebrowser.prevpage Prev. Page filebrowser.prevpage Prev. page
filebrowser.scan Scaning folder filebrowser.scan Scaning folder
filebrowser.select Select filebrowser.select Select
filebrowser.showrights Show file rights filebrowser.showrights Show file rights