Stefan Seyfried
8253c4d67c
Merge remote-tracking branch 'check/next-cc'
...
needs some build-fixing and merge errors are likely :-(
Conflicts:
configure.ac
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/unmaintained/dutch.locale
lib/libdvbsub/Makefile.am
lib/libdvbsub/dvbsubtitle.cpp
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/daemonc/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/framebuffer.h
src/driver/pictureviewer/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/driver/volume.cpp
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/audioplayer.cpp
src/gui/bedit/Makefile.am
src/gui/bedit/bouqueteditor_chanselect.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/components/Makefile.am
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/keybind_setup.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/test_menu.cpp
src/gui/test_menu.h
src/gui/update.cpp
src/gui/videosettings.cpp
src/gui/widget/Makefile.am
src/gui/widget/buttons.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
src/system/setting_helpers.cpp
src/system/settings.h
src/zapit/include/zapit/client/zapitclient.h
src/zapit/include/zapit/femanager.h
src/zapit/include/zapit/getservices.h
src/zapit/lib/zapitclient.cpp
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
2013-05-10 10:06:47 +02:00
Jacek Jendrzej
36044a9414
update encoding.conf by EnoSat
2013-05-01 11:47:10 +02:00
Jacek Jendrzej
3f8536b029
update slovak locale by EnoSat
2013-05-01 11:46:28 +02:00
Michael Liebmann
7061c1179a
* deutsch.locale complements
2013-04-18 18:51:58 +01:00
Michael Liebmann
9adfd63f1f
* Sort unmaintained locale
2013-04-18 18:51:58 +01:00
Michael Liebmann
81613f209d
* Sort deutsch.locale / english.locale
2013-04-18 18:51:58 +01:00
[CST] Focus
8bb70d1ab3
Merge branch 'pu/cc' into next-cc
...
Conflicts:
acinclude.m4
data/locale/deutsch.locale
data/locale/english.locale
src/driver/volume.cpp
src/eitd/SIlanguage.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bedit/bouqueteditor_chanselect.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan.h
src/gui/test_menu.cpp
src/gui/timeosd.cpp
src/gui/widget/progressbar.cpp
src/gui/widget/progressbar.h
src/neutrino.cpp
src/nhttpd/yconfig.h
2013-04-17 13:32:12 +04:00
Stefan Seyfried
da327c099b
add menu option to delete 'removed channels'
2013-04-17 10:21:33 +04:00
svenhoefer
976d3669ed
- english.locale: typo
2013-04-17 10:21:32 +04:00
[CST] Focus
b8519d2db0
locals: add locale for ignore CI messages option
2013-04-16 13:16:40 +04:00
Stefan Seyfried
aa8a137707
add menu option to delete 'removed channels'
2013-04-15 19:34:26 +02:00
Stefan Seyfried
1c58f5f093
add menu option to delete 'removed channels'
2013-04-14 12:46:10 +02:00
Stefan Seyfried
61bf95f552
Merge branch 'check/pu-cc' into master
...
Conflicts:
src/gui/osd_setup.cpp
src/neutrino.cpp
2013-04-13 17:17:30 +02:00
svenhoefer
4b624f88bd
- english.locale: typo
2013-04-13 11:46:06 +02:00
svenhoefer
473d6f38ba
- eventlist: make additional infos switchable
...
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable
2013-04-13 11:13:23 +02:00
Stefan Seyfried
899fcaf8ca
osd_setup: bring progressbar locales closer to mainline
2013-04-06 15:20:46 +02:00
Stefan Seyfried
8b689f4b26
Merge branch 'check/pu-cc' into master
...
...needs some build- and logical fixing...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/volume.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
src/gui/scan.cpp
src/gui/timeosd.cpp
src/gui/widget/progressbar.cpp
src/gui/widget/progressbar.h
2013-04-06 14:28:16 +02:00
Stefan Seyfried
5ad0b6b6dc
Merge branch 'check/pu-cc' into master
...
needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/framebuffer.h
src/driver/volume.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/filebrowser.cpp
src/gui/imageinfo.cpp
src/gui/infoviewer.cpp
src/gui/streaminfo2.cpp
src/gui/widget/textbox.cpp
2013-04-06 11:21:55 +02:00
Stefan Seyfried
27493de2ef
neutrino: add the possibility to lock bouquets by default
...
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.
Conflicts:
src/gui/channellist.cpp
2013-04-05 15:52:58 +04:00
[CST] Focus
83cbc1cbef
dutch.locale: update
2013-04-05 14:54:22 +04:00
Michael Liebmann
d4e54571a4
* Sort locales
2013-04-01 19:25:21 +01:00
[CST] Focus
4d1bf5c3d6
deutsch.locale: remove 'coolstream' after merge
2013-04-01 16:30:36 +04:00
Jacek Jendrzej
cecbd13107
data/satellites.xml: update Eurobird 9A (9.0E)
2013-04-01 16:18:42 +04:00
svenhoefer
c20d1ef6eb
- osd_progressbar_setup: rework locales; marginal changes in code
...
Conflicts:
data/locale/deutsch.locale
2013-04-01 16:14:29 +04:00
Stefan Seyfried
2fe93f6285
create zapit config dir on install
2013-04-01 15:43:08 +04:00
svenhoefer
4714a30f83
- strech most windows to full screen
...
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
Conflicts:
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bedit/bouqueteditor_chanselect.cpp
2013-04-01 15:42:38 +04:00
svenhoefer
30a0fdafda
- fix another typo around DATA_PIDS
2013-04-01 15:07:55 +04:00
svenhoefer
ea21a9a84f
- deutsch.locale: fix typos
2013-04-01 15:07:25 +04:00
Jacek Jendrzej
b2241df43d
-add record option for teletext & dvbsub pids
2013-04-01 15:07:05 +04:00
[CST] Focus
caca00682d
locals: add locale for numeric zap adjust option
2013-04-01 14:15:14 +04:00
svenhoefer
c07b8781a5
- imageinfo: remove some fixed width values ...
...
... to avoid possible ugly overlaps
* split kernel-version from image-version
* whitespace cleanup
2013-03-30 16:03:27 +01:00
[CST] Focus
b126a457c6
data/icons/Makefile.am: add icons for tuner 3/4
2013-03-27 19:41:47 +04:00
[CST] Focus
7da9f2791a
data/icons/start.jpg: modified start.jpg, thanks to bazi98
2013-03-27 16:34:29 +04:00
[CST] Focus
24a6874c22
locals, english.locale: add locales for more MB foot buttons
2013-03-27 16:19:50 +04:00
[CST] Focus
83f27e69d8
add icons for tuner 3/4
2013-03-27 15:00:55 +04:00
Stefan Seyfried
8835f4a0c7
Revert "progressbar-menu-tomworld"
...
This reverts commit be2966035f
2013-03-26 19:17:29 +01:00
Stefan Seyfried
3ab1cd74da
Revert "progresbar -add colored & vertical design , ported from neutrino-mp"
...
This reverts commit a501b6efeb
2013-03-26 19:17:06 +01:00
Stefan Seyfried
b367b0f5e9
Revert "- osd_progressbar_setup: rework locales; marginal changes in code"
...
This reverts commit 33c8526673
2013-03-26 19:15:04 +01:00
[CST] Focus
eb03492fe6
update dutch.locale
2013-03-26 16:15:00 +04:00
Jacek Jendrzej
3a68a4bf19
data/satellites.xml: update Eurobird 9A (9.0E)
2013-03-26 11:52:21 +01:00
svenhoefer
33c8526673
- osd_progressbar_setup: rework locales; marginal changes in code
2013-03-26 00:48:04 +01:00
Stefan Seyfried
eea77b7c8a
create zapit config dir on install
2013-03-25 16:48:25 +01:00
[CST] Focus
7b17a3f1b5
data/icons/start.jpg: fix, nevis dont decode prev version
2013-03-25 15:55:43 +04:00
svenhoefer
759966f935
- strech most windows to full screen
...
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
2013-03-25 09:45:22 +01:00
[CST] Focus
cdf10ef46e
remove 'coolstream' from gui
2013-03-22 10:52:39 +04:00
[CST] Focus
b06b580800
data/locale/unmaintained/dutch.locale: update locale
2013-03-22 10:43:53 +04:00
svenhoefer
d0164eaaf6
- fix another typo around DATA_PIDS
2013-03-20 21:50:16 +01:00
svenhoefer
9b7c96f07e
- deutsch.locale: fix typos
2013-03-20 21:41:14 +01:00
Jacek Jendrzej
d9c7739aa6
-add record option for teletext & dvbsub pids
2013-03-19 17:14:04 +01:00
Michael Liebmann
9755751217
* Imageinfo: Format license text
2013-03-19 11:54:57 +01:00
