Commit Graph

10 Commits

Author SHA1 Message Date
vanhofen
73aeca3b3c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/audioplayer.cpp
	src/system/localize.h


Origin commit data
------------------
Commit: c5df56955b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
2017-07-04 14:06:36 +02:00
Thilo Graf
e9fbf6c816 CLocaleManager: add casted version of getText() function
Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().


Origin commit data
------------------
Commit: 6aa66b84c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-07-03 (Mon, 03 Jul 2017)

Origin message was:
------------------
CLocaleManager: add casted version of getText() function

Allows easier handling with strings instead const char
for usage as string source. Separate casts are not requiered.

Overload of getText() was not possible but,
name getTextAsString() is keeping namespace of base function
getText().
2017-07-04 12:22:53 +02:00
vanhofen
9781410067 localize: add getString() function for a smoother string handling
Origin commit data
------------------
Commit: 83af9d836c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-29 (Mon, 29 May 2017)

Origin message was:
------------------
- localize: add getString() function for a smoother string handling
2017-05-29 11:49:00 +02:00
martii
29f0d5f0e7 system/localize: change memory allocation, no user-visible changes
Origin commit data
------------------
Commit: 9f563d7209
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-13 11:56:11 +01:00
Thilo Graf
b5bfaf531c localize: use general syntax for #incude
Origin commit data
------------------
Commit: 9cfd8e675d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-12 (Fri, 12 Jul 2013)
2013-07-21 22:03:41 +02:00
Jacek Jendrzej
99a84a1eef osd fix, tab for screening
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@837 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: dcb785079e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-10-13 (Wed, 13 Oct 2010)
2010-10-13 14:47:27 +00:00
[CST] Focus
03b826adc6 Separate subtitles preferences on request; Load english locale to use as default for not complete locales
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@385 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8afd4d31d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-19 (Fri, 19 Feb 2010)
2010-02-19 14:00:53 +00:00
[CST] Focus
433ffca09d Rework of prefered language code to support both possible iso639 codes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@372 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 0fc1a8fe07
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-18 (Thu, 18 Feb 2010)
2010-02-18 12:48:55 +00:00
[CST] Focus
d2534e8c32 Prefered language settings for testing, at the moment for audio and epg
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@361 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 81276253ae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-17 (Wed, 17 Feb 2010)
2010-02-17 13:13:43 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00