Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -2321,6 +2321,7 @@ timerlist.bouquetselect Bouquet wählen
 timerlist.channel Kanal
 timerlist.channelselect Kanal wählen
 timerlist.delete Löschen
+timerlist.info Info
 timerlist.menumodify Timer bearbeiten
 timerlist.menunew Neuer Timer
 timerlist.message Nachricht
@@ -2356,6 +2357,7 @@ timerlist.repeatcount Wiederholungen
 timerlist.repeatcount.hint_1 Anzahl der Timerausführungen
 timerlist.repeatcount.hint_2 0 für unbegrenzte Anzahl
 timerlist.save Timer speichern
+timerlist.send.timer Sende Timer
 timerlist.standby Aktion
 timerlist.standby.off Aufwachen aus Standby
 timerlist.standby.on In Standby gehen

data/locale/english.locale

@@ -2321,6 +2321,7 @@ timerlist.bouquetselect choose bouquet
 timerlist.channel Channel
 timerlist.channelselect choose channel
 timerlist.delete Delete
+timerlist.info Info
 timerlist.menumodify Modify timer
 timerlist.menunew New timer
 timerlist.message Message
@@ -2356,6 +2357,7 @@ timerlist.repeatcount repeats
 timerlist.repeatcount.hint_1 Amount of timer repeats
 timerlist.repeatcount.hint_2 0 for unlimited repeats
 timerlist.save Save timer
+timerlist.send.timer Send Timer
 timerlist.standby Action
 timerlist.standby.off Leave standby
 timerlist.standby.on Enter standby