Commit Graph

1121 Commits

Author SHA1 Message Date
vanhofen
dc58fffbea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
2016-12-06 13:02:25 +01:00
Michael Liebmann
3b858ecd22 Sort locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd21f57406
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-12-02 (Fri, 02 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 15:54:56 +01:00
vanhofen
34033b62a8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7553aad1b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 12:50:53 +01:00
vanhofen
1f9ff72365 locale: typo; we shouldn't open Manu XD
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca53cbeb53
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: typo; we shouldn't open Manu XD

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
8e4b9462f2 locale: more movieplayer additional help text
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e34a3020
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- locale: more movieplayer additional help text

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 12:46:01 +01:00
vanhofen
d81874eb61 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87da827b30
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 00:52:33 +01:00
vanhofen
40eb7f2667 movieplayer: rework help; use rc_help to show help
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ad794e004
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-05 (Mon, 05 Dec 2016)

Origin message was:
------------------
- movieplayer: rework help; use rc_help to show help

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-05 00:50:39 +01:00
vanhofen
6494a1278f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e22dcefea
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 22:48:16 +01:00
vanhofen
92008d0b7c moviebrowser: rework help ...
* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


Origin commit data
------------------
Branch: ni/coolstream
Commit: 21ed22cb6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- moviebrowser: rework help ...

* remove from menu; this breakes menu's logic (rc_help is to switch hints)
* use rc_help to show help window
* rework content


------------------
This commit was generated by Migit
2016-12-04 22:44:44 +01:00
vanhofen
510bce444c themes: make Material Gray (dark) theme a bit darker
Origin commit data
------------------
Branch: ni/coolstream
Commit: bab36f5c6b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: make Material Gray (dark) theme a bit darker

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 00:41:17 +01:00
vanhofen
3db60ff17f themes: add Material Gray (Medium) theme
Origin commit data
------------------
Branch: ni/coolstream
Commit: 236e6541f2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)

Origin message was:
------------------
- themes: add Material Gray (Medium) theme

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-12-04 00:40:15 +01:00
vanhofen
243909caf8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 22:00:25 +01:00
Thilo Graf
4f2116df43 Messages: add localized osd timeout option for interactive/static messages
TODO: add locales for hints


Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
vanhofen
0b8c62cd41 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
2016-11-22 23:45:32 +01:00
Michael Liebmann
99b59f1641 Add missing locale
- Supplement to commit 083df328e1
 and ea9be5f37c


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab11919298
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)

Origin message was:
------------------
Add missing locale

 - Supplement to commit 083df328e1
  and ea9be5f37c


------------------
This commit was generated by Migit
2016-11-22 19:19:30 +01:00
Michael Liebmann
f51b6c1076 Sort locale
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8e314695b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-11-22 (Tue, 22 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-22 19:19:30 +01:00
vanhofen
f57041a98b locale: adapt last changes to our locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72cd1d51a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: adapt last changes to our locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 11:52:30 +01:00
vanhofen
58b51d591e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: fb596af13d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 10:11:08 +01:00
vanhofen
8758c55f75 locale: use german "usw." instead of "etc."
Origin commit data
------------------
Branch: ni/coolstream
Commit: fbb6e4c15f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: use german "usw." instead of "etc."

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 09:16:27 +01:00
vanhofen
8a0ae7e26e locale: fix "/" usage
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47a62dd719
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix "/" usage

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 08:53:26 +01:00
vanhofen
04ead2aa7a locale: remove "CST" strings
Origin commit data
------------------
Branch: ni/coolstream
Commit: d240c625f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: remove "CST" strings

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 08:40:06 +01:00
vanhofen
9b2b94e830 locale: right case for LEDs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a39da118d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: right case for LEDs

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 08:36:17 +01:00
vanhofen
6cccdfc274 locale: fix usage of ampersand; it's not an "and"-replacement
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed55511778
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ampersand; it's not an "and"-replacement

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 08:19:26 +01:00
vanhofen
fc79635fd4 locale: fix usage of ellipses
Origin commit data
------------------
Branch: ni/coolstream
Commit: e836943a4a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)

Origin message was:
------------------
- locale: fix usage of ellipses

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 07:59:22 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
TangoCash
083df328e1 add option to read saved epg data frequently
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-20 19:24:08 +01:00
vanhofen
209ca4b776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 18:36:35 +01:00
Thilo Graf
c3ffba3c24 Messages: add option to change size of message text
Include default size and localized setup.

TODO: localize for nederlands and slovak, current english only.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4988df1dd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 01:08:14 +01:00
vanhofen
4a456fea74 locale: re-add the name "Neutrino" instead of "GUI" in some locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 41fe43ae55
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)

Origin message was:
------------------
- locale: re-add the name "Neutrino" instead of "GUI" in some locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-20 01:01:22 +01:00
vanhofen
3c0c5d594a re-add our welcome message to vfd; we're NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d5fb8ee3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)

Origin message was:
------------------
- re-add our welcome message to vfd; we're NI \o/

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-19 21:30:53 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
Thilo Graf
61be99ed13 Locales: use generic gui name in messages and windows
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b4f976c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-18 (Fri, 18 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-18 17:46:17 +01:00
Thilo Graf
b39aae929f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59ae2b52e9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 21:53:06 +01:00
vanhofen
f4c831795c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2b789452a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:51 +01:00
vanhofen
9d65df3050 locale: small changes in moviebrowser's bookmark locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3839c7f5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser's bookmark locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-17 01:48:32 +01:00
Thilo Graf
4aa0dca60b Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


------------------
This commit was generated by Migit
2016-11-15 19:49:27 +01:00
vanhofen
aaf3946608 followscreenings: re-add possibility to show followscreenings in every case
This commit replaces formerly commit 5b4e8952fa


Origin commit data
------------------
Branch: ni/coolstream
Commit: b7838210a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
- followscreenings: re-add possibility to show followscreenings in every case

This commit replaces formerly commit 5b4e8952fa


------------------
This commit was generated by Migit
2016-11-15 00:05:02 +01:00
vanhofen
ff9095e66b Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 5b4e8952fa.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:36 +01:00
vanhofen
9cab869e17 Revert "- deutsch.locale: minor changes in menu.hint_record_tevents"
This reverts commit fa63ad16f7.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23cbcbcdb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:20 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 23:02:33 +01:00
vanhofen
715af20490 followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-14 22:58:43 +01:00
Thilo Graf
e85436e185 Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97006c6615
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 21:33:12 +01:00
vanhofen
cae6749ba3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: abb8e5f02a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 13:59:11 +01:00
vanhofen
8c75cc78d2 locale: small changes in moviebrowser locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: af9672edb8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- locale: small changes in moviebrowser locales

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-11 13:46:55 +01:00
Thilo Graf
0018c2b158 Merge branch 'master' into pu/msgbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
2016-11-10 10:27:22 +01:00
vanhofen
8b356f92b7 Merge branch 'master' into pu/moviebrowser
Origin commit data
------------------
Branch: ni/coolstream
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-07 13:46:01 +01:00
Thilo Graf
fbf803565f Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-06 23:16:36 +01:00
FlatTV
f8a395eba5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-06 08:15:03 +01:00
vanhofen
ccc9e0c65d locale: update slovak; thx to Pr0metheus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-05 22:15:49 +01:00
vanhofen
11b0ea0b84 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-05 21:11:37 +01:00