Conflicts:
data/locale/english.locale
src/gui/channellist.cpp
src/gui/parentallock_setup.cpp
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bdcb043521
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- deutsch.locale: update
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c52e2b87f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-04 (Tue, 04 Nov 2014)
Origin message was:
------------------
- re-enable front-panel settings for Trinity; re-sort vfd_setup
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93d62fd11a
Author: Janus <janus@debian>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Origin message was:
------------------
-add CBouquetManager writenames menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a30d7d921
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d7b746685
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 837cbbe5a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-23 (Thu, 23 Oct 2014)
Origin message was:
------------------
- locale: update nederlands.locale; translated by Astrasat
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2af0d0c4ee
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-10-22 (Wed, 22 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 331665d847
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-21 (Tue, 21 Oct 2014)
Origin message was:
------------------
- deutsch.locale: update
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c43438baec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 765ad18b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-08 (Wed, 08 Oct 2014)
Origin message was:
------------------
- plugins: add and use default hint icon; THX to fred_feuerstein
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa11feb735
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-07 (Tue, 07 Oct 2014)
Origin message was:
------------------
- deutsch.locale: remove dup entrys
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 02a5a5f9db
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8d398a69a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6474ad6fdc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c2181a605f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7908c87f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/moviebrowser.cpp
src/system/nkparser.cpp
src/system/nkparser.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd1ba8df97
Author: martii <m4rtii@gmx.de>
Date: 2013-11-17 (Sun, 17 Nov 2013)
------------------
This commit was generated by Migit
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/moviebrowser.cpp
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fac02ba45
Author: martii <m4rtii@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)
------------------
This commit was generated by Migit
original code (C) martii <m4rtii@gmx.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: d83d519c86
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-17 (Wed, 17 Sep 2014)
------------------
This commit was generated by Migit
Conflicts:
src/gui/moviebrowser.cpp
src/gui/nfs.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 706ea95092
Author: martii <m4rtii@gmx.de>
Date: 2013-06-29 (Sat, 29 Jun 2013)
------------------
This commit was generated by Migit
...when Boolean parameters are passed as a string or number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86186e6443
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a96ab4d5e4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/dboxinfo.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b5b4249d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Origin message was:
------------------
- locale: remove onekey plugin rests
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 37dac846d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)
Origin message was:
------------------
- locale: change locale of plugintype.lua
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f07e81c4b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Origin message was:
------------------
- neutrino_menue: rename audioplayer/picviewer menu to multimedia menu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4af8bf9607
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Origin message was:
------------------
- deutsch.locale: better deutsch
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8959cf510a
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Origin message was:
------------------
- locals: resort
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb2a3b418b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Origin message was:
------------------
- deutsch.locale: upgrade
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
initial code (C) martii,
initial patch from jacek
Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
------------------
This commit was generated by Migit
switch to new dvb-api headers;
improve dvb-t manual scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9c7662c73
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)
Origin message was:
------------------
- movieplayer: ask before stop temporary timeshift
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a9d363251
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc3e9ebd62
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fc95d6395
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-05-15 (Thu, 15 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
* thx to bazi98, martii and benny
Origin commit data
------------------
Branch: ni/coolstream
Commit: df1c8ac00d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Origin message was:
------------------
- channellist: add colored progressbars
* thx to bazi98, martii and benny
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e08c361a7
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-06 (Fri, 06 Jun 2014)
Origin message was:
------------------
- satellites.xml: update freq 12722000 as suggested by Janus
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99a7f2ba3b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-29 (Thu, 29 May 2014)
Origin message was:
------------------
streaminfo2.cpp -fix bitrate calc offset and use utf8
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Labels are generally always capitalized
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61dc01f719
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-20 (Tue, 20 May 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f99e88ba2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-14 (Wed, 14 May 2014)
Origin message was:
------------------
- deutsch.locale: update
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
