Commit Graph

155 Commits

Author SHA1 Message Date
Michael Liebmann
bfb4babf6b CInfoClock: Use dynamic font for display
Origin commit data
------------------
Branch: ni/coolstream
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-28 16:07:49 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
[CST] Focus
8a22fe0ec9 gui/osd_setup.cpp: fix Window size in menu, snprintf take care about 0 at the end
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e423e2bd7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-07 18:59:42 +04:00
[CST] Focus
d535a4c4d6 gui/osd_setup.cpp: add support to change window width and height,
use buttons up/down to change height, left/right to change width, page up/down to change both


Origin commit data
------------------
Branch: ni/coolstream
Commit: aaf9d3edf6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)



------------------
This commit was generated by Migit
2013-11-07 17:27:23 +04:00
vanhofen
930f73dae6 osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)


------------------
This commit was generated by Migit
2013-09-02 20:59:26 +02:00
Michael Liebmann
4f0d411e1c CNeutrinoFonts: Use separate font renderer for dynamic fonts
- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


Origin commit data
------------------
Branch: ni/coolstream
Commit: e473df6a43
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)

Origin message was:
------------------
CNeutrinoFonts: Use separate font renderer for dynamic fonts

- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


------------------
This commit was generated by Migit
2013-07-26 14:52:37 +02:00
Michael Liebmann
a552ac1c82 Add option to resize the VolumeBar
- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a0035c2ae
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-29 (Sat, 29 Jun 2013)

Origin message was:
------------------
Add option to resize the VolumeBar

- Minimum height: Height of NEUTRINO_ICON_VOLUME + 2 pixels
- Maximum height: 50 pixels
- Setting can be changed with:
 Menu -> Settings -> OSD -> Volume -> Height of display


------------------
This commit was generated by Migit
2013-07-21 22:06:05 +02:00
Michael Liebmann
c82257306f Add new class CNeutrinoFonts for setup and modify neutrino fonts
- move SetupFonts() from CNeutrinoApp to CFontSetup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 465d2aba23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)



------------------
This commit was generated by Migit
2013-07-21 22:05:14 +02:00
Michael Liebmann
5394e251b8 COsdSetup: Fix segfault due 'double free or corruption' (glibc)
- remove 'delete mfFontFile' & 'delete mfTtxFontFile' from destructor
- initialize variables mfFontFile & mfTtxFontFile


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfd5c29371
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-04 (Thu, 04 Jul 2013)



------------------
This commit was generated by Migit
2013-07-04 22:58:36 +02:00
Michael Liebmann
be561abd35 COsdSetup: Display file names in font setup menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d3a05fe0a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-03 (Wed, 03 Jul 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:10 +02:00
Michael Liebmann
ca470f6323 CVolumeBar: add enums for volume bar pos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a63a85584
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)


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

------------------
This commit was generated by Migit
2013-07-03 07:30:09 +02:00
Michael Liebmann
e2ba87187f CVolumeBar: Reactivate position 'higher center' for volume bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: c70167b58f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-06 (Thu, 06 Jun 2013)


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

------------------
This commit was generated by Migit
2013-06-06 12:00:06 +02:00
vanhofen
e213733fde locals: use more matching descriptions for screen positions
Origin commit data
------------------
Branch: ni/coolstream
Commit: c80b1b0640
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-11 (Sat, 11 May 2013)

Origin message was:
------------------
- locals: use more matching descriptions for screen positions

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

------------------
This commit was generated by Migit
2013-05-11 12:57:36 +02:00
Michael Liebmann
f73d990572 COsdSetup::changeNotify: Add handling for volume digits / CVolumeHelper
Origin commit data
------------------
Branch: ni/coolstream
Commit: d90ce27876
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-11 (Sat, 11 May 2013)

Origin message was:
------------------
* COsdSetup::changeNotify: Add handling for volume digits / CVolumeHelper

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

------------------
This commit was generated by Migit
2013-05-11 09:38:23 +01:00
vanhofen
48ea7a045e osd-setup: fix segmentation fault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1376a94197
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- osd-setup: fix segmentation fault

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

------------------
This commit was generated by Migit
2013-05-10 22:48:37 +02:00
vanhofen
9689f4572f osd-setup: move menu-related stuff to a submenu 'menus'
* re-sort remaining items


Origin commit data
------------------
Branch: ni/coolstream
Commit: 655ae5d51f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- osd-setup: move menu-related stuff to a submenu 'menus'

* re-sort remaining items


------------------
This commit was generated by Migit
2013-05-10 21:36:34 +02:00
Michael Liebmann
cd11f3173a OSD Setup: Move volume settings in a separate submenu.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d33901e5e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-09 (Thu, 09 May 2013)

Origin message was:
------------------
* OSD Setup: Move volume settings in a separate submenu.

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

------------------
This commit was generated by Migit
2013-05-09 16:58:52 +01:00
Thilo Graf
d6c76ef8a8 CVolumeBar: rework volumebar handling
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-08 05:11:24 +01:00
[CST] Focus
0c3a4fa858 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bb70d1ab3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-17 (Wed, 17 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 13:32:12 +04:00
Stefan Seyfried
93ed1cbc2b auto-enumerate FONT_TYPE_COUNT instead of defining it
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5954735ed8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-15 (Mon, 15 Apr 2013)



------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
d5aebb9f1c auto-enumerate FONT_TYPE_COUNT instead of defining it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f1aa08562
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-15 (Mon, 15 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-15 21:37:43 +02:00
vanhofen
d956906ecb eventlist: make additional infos switchable
* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


Origin commit data
------------------
Branch: ni/coolstream
Commit: 473d6f38ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-13 (Sat, 13 Apr 2013)

Origin message was:
------------------
- eventlist: make additional infos switchable

* new menu 'eventlist' in osd-setup
* fix offset in infozone
* fontsize for infozone adjustable


------------------
This commit was generated by Migit
2013-04-13 11:13:23 +02:00
vanhofen
404e090810 osd_progressbar_setup: rework locales; marginal changes in code
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: c20d1ef6eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

Conflicts:
	data/locale/deutsch.locale


------------------
This commit was generated by Migit
2013-04-01 16:14:29 +04:00
Thilo Graf
85e58b9a2c CProgressbarSetup: using unified 'osd' namespace
Origin commit data
------------------
Branch: ni/coolstream
Commit: cca6d898c8
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-19 (Tue, 19 Mar 2013)


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

------------------
This commit was generated by Migit
2013-04-01 15:06:41 +04:00
[CST] Focus
4e1a711d5a gui/osd_setup.cpp: fix show tuner icon option
Origin commit data
------------------
Branch: ni/coolstream
Commit: fc0571490e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-26 19:53:09 +04:00
vanhofen
23d8c868bb osd_progressbar_setup: rework locales; marginal changes in code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33c8526673
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

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

------------------
This commit was generated by Migit
2013-03-26 00:48:04 +01:00
Thilo Graf
edc80c205d CProgressbarSetup: using unified 'osd' namespace
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e1ef5d325
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-19 (Tue, 19 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-19 08:12:43 +01:00
Jacek Jendrzej
7265c17614 progressbar-menu-tomworld
Origin commit data
------------------
Branch: ni/coolstream
Commit: 369289d179
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-12 17:27:52 +04:00
Jacek Jendrzej
945abccd41 progressbar-menu-tomworld
Origin commit data
------------------
Branch: ni/coolstream
Commit: be2966035f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 Mar 2013)


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

------------------
This commit was generated by Migit
2013-03-11 14:40:36 +01:00
vanhofen
5fa09e19d5 osd_setup.cpp: move dest-dir for screenshots to top of menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: d4370304cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-26 (Tue, 26 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: move dest-dir for screenshots to top of menu

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

------------------
This commit was generated by Migit
2013-02-26 13:10:17 +01:00
Jacek Jendrzej
7b1136be21 add progressbar hint loc
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fb981b447
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 19:26:46 +01:00
Jacek Jendrzej
a46d3a42ef add progressbar opt to infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)


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

------------------
This commit was generated by Migit
2013-02-12 18:03:50 +01:00
tomworld
177ebb4fba channellist.cpp: Use extra font for event list
Origin commit data
------------------
Branch: ni/coolstream
Commit: 105c6b4c70
Author: tomworld <atzeworld@msn.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)

Origin message was:
------------------
* channellist.cpp: Use extra font for event list

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

------------------
This commit was generated by Migit
2013-02-12 15:45:27 +01:00
vanhofen
f199acd4b7 osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line
Origin commit data
------------------
Branch: ni/coolstream
Commit: e07e95bfb2
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-05 (Tue, 05 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: fix color-hotkey for channellist-submenu and add a seperator line

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

------------------
This commit was generated by Migit
2013-02-05 00:44:13 +01:00
vanhofen
536c7913ab osd_setup.cpp: add 'channellist.additional' to channellist's submenu
very ugly: same code two times


Origin commit data
------------------
Branch: ni/coolstream
Commit: ce0025c7cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- osd_setup.cpp: add 'channellist.additional' to channellist's submenu

very ugly: same code two times


------------------
This commit was generated by Migit
2013-02-04 23:43:16 +01:00
vanhofen
ca1569c428 channellist: make miniTV switchable
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)

Origin message was:
------------------
- channellist: make miniTV switchable

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

------------------
This commit was generated by Migit
2013-02-04 22:25:15 +01:00
TangoCash
263340cd22 add optional mini-tv to channellist
Signed-off-by: satbaby <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a425308ed
Author: TangoCash <eric@loxat.de>
Date: 2013-01-30 (Wed, 30 Jan 2013)



------------------
This commit was generated by Migit
2013-01-30 19:17:52 +01:00
[CST] Focus
50547a36fb gui/osd_setup.cpp: remove unneeded colorSetupNotifier->changeNotify
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc6a239002
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-02 12:56:44 +04:00
[CST] Focus
ce7f439559 gui/osd_setup.cpp: set hints for channel list context menu -> settings,
testing menu/hints over gui with save-screen.
TODO: still small glitch at menu bottom, when switching hints on/off
with help button, sometimes.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 483e9563e5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-20 (Sat, 20 Oct 2012)



------------------
This commit was generated by Migit
2012-10-20 11:13:22 +04:00
Michael Liebmann
b7dbab80c0 osd_setup.cpp: Fix segfault in mode single tuner/display tuner icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a414b7c56
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)


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

------------------
This commit was generated by Migit
2012-10-02 11:08:48 +01:00
Thilo Graf
c28551f89d COsdSetup: show correct option in infobar tuner icon setup item
It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.


Origin commit data
------------------
Branch: ni/coolstream
Commit: ca748c6f48
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-09-18 (Tue, 18 Sep 2012)

Origin message was:
------------------
*COsdSetup: show correct option in infobar tuner icon setup item

It could be confused for single stb users to see the option
'ON', although it is not possible.
So it's better to show only a possible or real option at item, if stb is in single mode or
item is disabled,
but the real value of g_settings.infobar_show_tuner is not touched.


------------------
This commit was generated by Migit
2012-09-18 12:10:18 +02:00
Thilo Graf
eb70cd2ac7 CInfoViewer: don't show tuner icon with single boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 807dce9497
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-08-30 (Thu, 30 Aug 2012)

Origin message was:
------------------
*CInfoViewer: don't show tuner icon with single boxes

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

------------------
This commit was generated by Migit
2012-09-18 12:10:17 +02:00
Thilo Graf
65580de20b COsdSetup: change order of includes
- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup


Origin commit data
------------------
Branch: ni/coolstream
Commit: 260af3fb65
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-07-29 (Sun, 29 Jul 2012)

Origin message was:
------------------
*COsdSetup: change order of includes

- typo fix in member name
 showOsdScreenshottSetup->showOsdScreenShotSetup


------------------
This commit was generated by Migit
2012-08-21 09:48:22 +01:00
Michael Liebmann
f52af18765 Numeric display volumebar can be switched off.
- Adjustable via Menu -> Settings -> OSD -> Volumebar digits


Origin commit data
------------------
Branch: ni/coolstream
Commit: ccd8e39182
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-27 (Fri, 27 Apr 2012)

Origin message was:
------------------
* Numeric display volumebar can be switched off.

- Adjustable via Menu -> Settings -> OSD -> Volumebar digits


------------------
This commit was generated by Migit
2012-07-23 09:07:10 +01:00
vanhofen
5cdbcebe88 osd_setup.cpp: remove double include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b66c00d04
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-20 (Fri, 20 Jul 2012)

Origin message was:
------------------
- osd_setup.cpp: remove double include

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

------------------
This commit was generated by Migit
2012-07-20 17:50:11 +02:00
[CST] Focus
b3195e2edc gui/osd_setup.cpp: fix channel list menu, if fade enabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b0dec611c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-16 19:05:35 +04:00
[CST] Focus
e3a8044d7d gui/osd_setup.cpp: in channel context menu->fonts use cancel button
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9c3f281445
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-16 16:23:24 +04:00
[CST] Focus
a44ddd82ad fix conflicts:
adding hints is work in progress, so until most is finished,
please avoid sorting locals.h, locals_intern.h, english.locale.
to resolve i had to sort (real, case-insensitive) this files


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d513d963
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)



------------------
This commit was generated by Migit
2012-07-12 12:53:53 +04:00
[CST] Focus
036a35cd87 gui/osd_setup.cpp: more hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: e69c99813c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-12 10:31:48 +04:00