Merge branch 'master' into pu/moviebrowser

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc717f56f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-29 12:26:05 +02:00
10 changed files with 71 additions and 20 deletions

View File

@@ -2102,11 +2102,11 @@ remotebox_channel_na Kanal auf Remote-Box nicht verfügbar
remotebox_del löschen
remotebox_head Remote-Boxen
remotebox_mod bearbeiten
remotebox_user Benutzer
remotebox_pass Passwort
remotebox_port Port
remotebox_rbaddr Adresse
remotebox_rbname Anzeigename
remotebox_user Benutzer
reset_all Werkseinstellungen und Reboot
reset_channels Lösche Kanäle
reset_confirm Sind Sie sich sicher?

View File

@@ -2102,11 +2102,11 @@ remotebox_channel_na Channel not available on Remote-Box
remotebox_del delete
remotebox_head Remote-Boxes
remotebox_mod modify
remotebox_user User
remotebox_pass Password
remotebox_port Port
remotebox_rbaddr Address
remotebox_rbname Screenname
remotebox_user User
reset_all Factory reset and reboot
reset_channels Delete all channels
reset_confirm Are you sure ?