Stefan Seyfried
c480e36746
Merge branch 'uncool/dvbsi++'
...
Conflicts:
src/driver/Makefile.am
src/driver/streamts.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/infoviewer_bb.cpp
src/gui/widget/textbox.h
2012-11-11 01:45:22 +01:00
svenhoefer
9a3d2c4cba
- english.locale: fix german word
2012-11-09 18:00:01 +01:00
satbaby
c47aebdb64
src/gui/channellist.cpp:-add sort by channel number
2012-11-09 17:32:15 +01:00
satbaby
a47c6593dc
neutrino: -add save epg on stadbyOn/Off option
2012-11-08 13:35:00 +01:00
svenhoefer
d9625254e0
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-11-07 13:04:52 +01:00
svenhoefer
6472840127
- network_setup.cpp: add more suitable hints to hostname-setup
2012-11-07 13:02:40 +01:00
micha-bbg
0c84840e10
* Software Update with apply the settings (Part9)
...
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()
2012-11-07 04:06:48 +01:00
svenhoefer
b6535a4823
- satellites.xml: update astra 19.2
2012-11-05 14:06:24 +01:00
micha-bbg
f4f954415b
* Software Update with apply the settings (Part6)
...
- Use identifier '#:' for config vars in settingsupdate.conf
2012-11-03 16:19:29 +01:00
Stefan Seyfried
a41951961a
locale: fix(?) circular dep, don't install unmaintained locales
2012-11-03 14:15:43 +01:00
Stefan Seyfried
7e23ac7223
Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'
...
...needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/scan.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
src/system/setting_helpers.cpp
src/zapit/src/capmt.cpp
2012-11-03 10:45:33 +01:00
Stefan Seyfried
259533f809
change data/Makefile.am to ease merging
2012-11-02 20:11:00 +01:00
svenhoefer
8336d4797d
- deutsch.locale: fix menu.hint_inact_timer
2012-11-01 20:32:10 +01:00
svenhoefer
22bafbcfc7
- locale: improve maintainer-targets
2012-10-25 10:43:56 +02:00
micha-bbg
dc8ddc5325
* Software Update with apply the settings (Part4)
...
- Use locale for message boxes
2012-10-25 01:10:36 +01:00
micha-bbg
b001b36f4a
* Software Update with apply the settings (Part1)
...
- Settings are applied to the image before flashing
- Use the function on the menu "Software Update => Expert functions
=> Write one partition => systemFS with settings"
- Log output to /tmp/update.log for testing
- Use settingsupdate.conf as config file
2012-10-25 01:10:35 +01:00
svenhoefer
f581006d0f
- icons: move orphaned icons to a subdir 'orphaned/'
2012-10-24 17:25:16 +02:00
svenhoefer
5cee221e46
- icons: supplement to previous commit
2012-10-24 16:56:28 +02:00
svenhoefer
90e3ad99d8
- icons: supplement to previous commit
2012-10-24 16:51:25 +02:00
svenhoefer
f92eb8e843
- icons: move locale icons to a subdir 'locale/'
2012-10-24 16:39:51 +02:00
svenhoefer
ca88052c14
- locale: rework helperscripts
2012-10-24 16:08:52 +02:00
svenhoefer
725b8be0d6
- locale: fix logic in Makefile
2012-10-24 16:00:27 +02:00
svenhoefer
f0bfe2167c
- locale: move scripts to subdir 'helpers/'
2012-10-24 15:45:57 +02:00
svenhoefer
ddef0da724
- locale: since focus deutsch.locale isn't longer the masterfile
2012-10-24 15:14:39 +02:00
svenhoefer
2e250fcb24
- locale: move unmaintained locale to subdir 'unmaintained/'
2012-10-24 13:12:05 +02:00
svenhoefer
dfbff310cc
- locals: some very tiny corrections
2012-10-24 10:16:56 +02:00
svenhoefer
ac752b70fb
- locales: supplement to 7657eff
2012-10-24 09:21:56 +02:00
[CST] Focus
7657effd8e
english.locale: fix some theme menu locals
2012-10-23 15:24:34 +04:00
satbaby
d21f7ca946
satellites.xml: update hotbird13
2012-10-19 12:21:47 +02:00
satbaby
c50487fc8b
update locale for commit 5002a8bfa7
2012-10-19 10:53:43 +02:00
svenhoefer
58f8e4e452
- deutsch.locale: add locals for slow_record stuff
2012-10-17 13:53:12 +02:00
[CST] Focus
5179aedb32
locals: add locale for slow record warning option
2012-10-16 19:53:15 +04:00
Stefan Seyfried
adb23b23ee
Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
micha-bbg
76efa8b033
* Fix english.locale
2012-10-14 11:15:57 +01:00
micha-bbg
295efb1e07
* Timerlist: Ask if the timer of a running recording to be deleted.
2012-10-14 10:07:22 +01:00
striper
006ca9e85a
- locales
...
* add german translation
* remove blank
2012-10-11 19:42:11 +02:00
svenhoefer
ce3f8eddf1
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-10-11 17:03:45 +02:00
svenhoefer
7a7aec266a
- network_setup.cpp: add ntp-server to network-test
2012-10-11 17:02:37 +02:00
[CST] Focus
11c5567cbc
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-10-11 18:03:04 +04:00
satbaby
849b306985
satellites.xml: update astra19 hotbird13
2012-10-10 13:07:10 +02:00
[CST] Focus
1c113127ce
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-10-08 11:06:47 +04:00
Stefan Seyfried
652f0e596f
use classic neutrino startup and shutdown logo for neutrino-mp
2012-10-07 17:34:56 +02:00
Stefan Seyfried
91b2998d68
osd setup: fix OSD area setup
...
The PNGs used to mark the upper left and bottom right corners
were both two pixels off, which resulted in the OSD area being
slightly bigger than indicated.
2012-10-07 17:30:44 +02:00
Stefan Seyfried
b02886aa92
add basic support for DVB-T
...
This needs more fine tuning wrt scan setup etc, but should work for now.
2012-10-07 17:09:17 +02:00
striper
27124f0328
- deutsch.locale: add some missing entries
2012-10-06 18:40:45 +02:00
striper
4a819b80eb
- cables.xml: add new transponders for Unitymedia
2012-10-06 18:40:30 +02:00
[CST] Focus
410b19aaf3
locals: add locales for start wizard initial settings
2012-09-29 14:45:57 +04:00
[CST] Focus
59ea9c05f3
locals: add locales for record status
2012-09-25 17:13:25 +04:00
Stefan Seyfried
1a62480581
use 'Neutrino' instead of 'Neutrino-HD' in locales
2012-09-23 21:10:54 +02:00
svenhoefer
708b6a3ad0
- neutrino.cpp: localize "Saving EPG"
2012-09-19 21:58:21 +02:00
