Stefan Seyfried
8048673dec
Merge branch 'check/next' into master
...
Conflicts:
data/locale/english.locale
src/neutrino.cpp
src/system/setting_helpers.cpp
2013-03-07 17:10:11 +01:00
[CST] Focus
aa60c85768
Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next
...
Conflicts:
lib/libconfigfile/configfile.cpp
src/system/setting_helpers.cpp
src/zapit/src/femanager.cpp
2013-03-07 17:10:57 +04:00
svenhoefer
2d611504af
- deutsch.locale: external plugin-dir must not be on a hdd
2013-03-05 22:46:06 +01:00
svenhoefer
ff1baefd00
- deutsch.locale: rework german menu hints
...
serveral fixes in spelling and grammar, intelligibility and wording
2013-03-05 22:37:21 +01:00
svenhoefer
6772336524
- locale: two little requested fixes (typo and intelligibility)
2013-03-05 21:22:32 +01:00
[CST] Focus
69b4d366af
Merge branch 'pip' into next
...
Conflicts:
src/gui/channellist.cpp
2013-02-28 16:45:41 +04:00
[CST] Focus
026592e8fe
Merge branch 'dvbsi++' into next
...
Conflicts:
src/neutrino.cpp
src/zapit/src/femanager.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
[CST] Focus
46692c8353
locals: add locales for PiP key
2013-02-28 16:19:12 +04:00
svenhoefer
c0959cc5f5
- icons: remove unneeded movieplayer.raw
2013-02-28 09:49:27 +01:00
[CST] Focus
ba25c9ed0f
add pip icon
2013-02-26 17:20:32 +04:00
[CST] Focus
1f02d55b60
locals: add video menu missed hints, add locals for PiP
2013-02-26 17:15:15 +04:00
svenhoefer
365300c830
- icons: add missing hint_a_pic.png
2013-02-26 13:30:13 +01:00
svenhoefer
e72d3685f0
- locale: clean screenshot-locale from unnecessary ballast
2013-02-26 13:07:20 +01:00
Stefan Seyfried
29a23bffb6
scan_setup: add option to set frontend type to multinorm boxes
2013-02-24 01:45:38 +01:00
Stefan Seyfried
0cf191822a
Merge branch 'check/dvbsi++' commit 5db16ee2ff
...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/channellist.cpp
src/gui/components/Makefile.am
src/gui/components/cc.h
src/gui/components/components.cpp
src/gui/moviebrowser.cpp
src/gui/scan.cpp
src/neutrino.cpp
src/zapit/src/bouquets.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-21 17:07:18 +01:00
svenhoefer
505c4ba80d
Revert "Revert '- channellist.cpp: enable to lock new_zap_mode'"
...
This reverts commit fb892d18ff
2013-02-17 22:55:28 +01:00
svenhoefer
b19bd87580
- icons: remove unneeded ddfill.png
2013-02-17 21:39:10 +01:00
svenhoefer
5357724b4c
- icons: remove unneeded radio.jpg
2013-02-16 16:38:05 +01:00
svenhoefer
aa1d9ce450
- icons: add missing multimedia.png
2013-02-16 13:14:50 +01:00
svenhoefer
fe3f4ce863
- icons: add missing hint_restart.png
2013-02-16 10:28:38 +01:00
svenhoefer
fb892d18ff
Revert "- channellist.cpp: enable to lock new_zap_mode"
...
This reverts commit 15d787f79b
2013-02-15 22:55:45 +01:00
[CST] Focus
6174c657a1
Merge branch 'dvbsi++' into next
2013-02-13 15:34:41 +04:00
micha-bbg
c7f250c2a7
* Sort english.locale
2013-02-13 11:41:04 +01:00
Jacek Jendrzej
6fb981b447
add progressbar hint loc
2013-02-12 19:26:46 +01:00
Jacek Jendrzej
63c66c1f4e
add progressbar opt to infobar
2013-02-12 18:03:50 +01:00
tomworld
105c6b4c70
* channellist.cpp: Use extra font for event list
2013-02-12 15:45:27 +01:00
[CST] Focus
46657a1c6b
merge dvbsi++
2013-02-11 13:29:09 +04:00
svenhoefer
15d787f79b
- channellist.cpp: enable to lock new_zap_mode
2013-02-10 21:03:43 +01:00
svenhoefer
d8bd46e9d1
- channellist: make miniTV switchable
2013-02-04 22:25:15 +01:00
[CST] Focus
43d825b62e
Merge branch 'dvbsi++' into next
2013-02-04 10:06:00 +04:00
micha-bbg
1c85803632
* src/gui/channellist.cpp: miniTV fix locale
...
- Add locale for menuhint
- Sort header for locale
2013-02-03 07:38:45 +01:00
svenhoefer
4b8d0e156e
- cables.xml: add "antennengemeinschaft penig"
...
thx Zeng!
2013-01-31 17:28:18 +01:00
[CST] Focus
bcd02435dd
Merge branch 'dvbsi++' into next
2013-01-31 17:40:19 +04:00
satbaby
5803ddf873
-add locale minitv
2013-01-30 23:41:40 +01:00
[CST] Focus
c7ef67ac84
data/locale/english.locale: change bouquets mode 'erase all' to 'erase old'
2013-01-28 11:50:41 +04:00
[CST] Focus
740efbba6b
locals: add locale for diseqc order and missed hints
2013-01-24 13:41:58 +04:00
[CST] Bas
1adc51c0b8
merge neutrino-apollo
2013-01-16 16:27:28 +04:00
[CST] Focus
6e41c65fad
merge public git changes
2013-01-09 19:30:07 +04:00
[CST] Focus
9b74fb88cf
data/locale/english.locale: new locals for tuner setup
2013-01-09 15:40:58 +04:00
satbaby
7d550ed88e
neutrino: -add unicabel menu option
2013-01-08 20:35:53 +01:00
Stefan Seyfried
8d69036be5
Merge branch 'uncool/dvbsi++' commit 3bbaddec39
...
Conflicts:
src/driver/framebuffer.cpp
2013-01-03 09:46:11 +01:00
Stefan Seyfried
e1c7f95d63
neutrino: update unicable code
...
* add an own diseqc type for unicable
* do not configure scr / freq per satellite but only per frontend
* use the diseqc setting of the satellite for determining input 0/1
2013-01-01 22:26:07 +01:00
micha-bbg
099d0181b6
* Software Update with apply the settings (Part14)
...
- Add warning/error if not enough space
- THX Striper for translation into English of the locale
2013-01-01 15:05:26 +01:00
micha-bbg
158a8ba4ce
* Software Update with apply the settings (Part13)
...
- Delete files from image, before apply settings
2013-01-01 15:05:21 +01:00
Stefan Seyfried
4b03fa98ba
locale: adapt helper scripts to current compilers
2012-12-31 22:16:46 +01:00
Stefan Seyfried
59e8be0b58
locale: fix ordercheck target
2012-12-31 22:16:46 +01:00
Stefan Seyfried
f6e3dcd385
create zapit config dir on install
2012-12-31 22:16:46 +01:00
Stefan Seyfried
f8f5467fdb
Merge branch 'uncool/dvbsi++' commit 4965619a79
...
Conflicts:
src/gui/widget/hintboxext.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
2012-12-30 21:35:20 +01:00
swing99
0ec6859ea9
cables.xml: update Kabel Deutschland - Offensive 2012
2012-12-10 16:17:56 +01:00
[CST] Bas
9448cd8d2a
Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
...
Conflicts:
src/nhttpd/yhttpd.cpp
2012-12-07 14:39:05 +08:00
