mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 10:51:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)
This commit is contained in:
vanhofen
2017-10-14 07:15:30 +02:00
parent 92ff583696 a11d152062
commit d8355fe5e4
16 changed files with 318 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -2584,6 +2584,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
@@ -2619,6 +2620,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

2
data/locale/english.locale
View File

@@ -2583,6 +2583,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
@@ -2618,6 +2619,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