Commit Graph

751 Commits

Author SHA1 Message Date
Jacek Jendrzej
f201ea2717 update slovak locale ( THX EnoSat ) 2013-06-03 21:13:50 +02:00
Michael Liebmann
78d9d97a82 * Update deutsch.locale (THX bazi98) 2013-06-02 18:42:39 +02:00
Jacek Jendrzej
e1310f8977 typo 2013-06-02 13:25:55 +02:00
[CST] Focus
f46fc25da0 Change image license to GPL v2 2013-06-02 10:48:10 +04:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
2013-06-02 10:46:42 +04:00
svenhoefer
7f3a7367e4 - locals: (re)sort 2013-06-01 17:41:47 +02:00
svenhoefer
ed9b4278b4 - imageinfo: show both vcs-info and built-date 2013-06-01 09:52:19 +02:00
[CST] Focus
3cfd62b9e1 locals: add locales for youtube feeds playback 2013-05-29 18:06:44 +04:00
[CST] Focus
87032e1438 add hint icon for youtube feeds playback 2013-05-29 18:06:17 +04:00
svenhoefer
40a77ade7c - icons: introducing dummy buttons 2013-05-27 10:48:37 +02:00
Stefan Seyfried
8a7095c208 remove obsolete locales 2013-05-24 23:31:17 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
2013-05-24 20:24:39 +02:00
rhabarber1848
19d47e04a5 Neutrino: Show audio track descriptions and program length in EPG info, patch by Gaucho316: http://www.dbox2-tuning.net/forum/viewtopic.php?f=2&t=49185 2013-05-23 21:08:18 +02:00
[CST] Focus
142d7c204c english.locale: fix copy-paste 2013-05-21 16:54:17 +04:00
Michael Liebmann
f6d72f6448 * Sort deutsch.locale 2013-05-18 14:44:20 +01:00
Jacek Jendrzej
35bac1ff40 CNeutrinoEventList::findEvents - add search all epg option 2013-05-17 21:08:09 +02:00
[CST] Bas
5b42594a1a neutrino: fix dutch locale, it's being maintained by Astrasat. Move it to 'maintained'. 2013-05-17 05:10:52 +08:00
[CST] Focus
34a87975a0 gui/audio_setup.cpp: add 'heavy' srs algo on apollo 2013-05-15 09:29:29 +04:00
svenhoefer
c80b1b0640 - locals: use more matching descriptions for screen positions 2013-05-11 12:57:36 +02:00
svenhoefer
fd63df9688 - deutsch.locale: fix typo in menu.hint_subchannel_pos 2013-05-10 21:55:19 +02:00
svenhoefer
655ae5d51f - osd-setup: move menu-related stuff to a submenu 'menus'
* re-sort remaining items
2013-05-10 21:36:34 +02:00
Jacek Jendrzej
0ce4f9d0d8 update encoding.conf by EnoSat 2013-05-10 16:59:56 +04:00
Jacek Jendrzej
51ea0e8624 update slovak locale by EnoSat 2013-05-10 16:59:48 +04:00
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
Michael Liebmann
3d33901e5e * OSD Setup: Move volume settings in a separate submenu. 2013-05-09 16:58:52 +01: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
c7d498f434 * deutsch.locale complements 2013-04-30 13:00:31 +04:00
Michael Liebmann
7a637bebf8 * Sort unmaintained locale 2013-04-30 13:00:24 +04:00
Michael Liebmann
b60e199620 * Sort deutsch.locale / english.locale 2013-04-30 13:00:02 +04:00
[CST] Focus
1e7589747c locals: add locale for file play subtitle select 2013-04-30 12:10:53 +04: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