Merge remote-tracking branch 'cst-next'

Origin commit data
------------------
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
This commit is contained in:
Stefan Seyfried
2016-01-16 12:51:04 +01:00
31 changed files with 148 additions and 119 deletions

View File

@@ -2159,6 +2159,7 @@ screensaver.dir Verzeichnis
screensaver.menu Bildschirmschoner
screensaver.mode Modus
screensaver.mode_clock Uhr
screensaver.mode_clock_color Farbige Uhr
screensaver.mode_image Bilder
screensaver.off Bildschirmschoner aus
screensaver.random Zufällige Bilderwahl

View File

@@ -2159,6 +2159,7 @@ screensaver.dir Directory
screensaver.menu Screensaver
screensaver.mode Mode
screensaver.mode_clock Clock
screensaver.mode_clock_color Clock colored
screensaver.mode_image Images
screensaver.off Screensaver off
screensaver.random Random Images