From b1e4da3be6552f58f3890bf2ad48879823d2e130 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 17 Jun 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.5.4=20-=20Increased=20APIVERSION=20(forgot?= =?UTF-8?q?=20to=20do=20that=20in=201.5.2=20and=201.5.3).=20-=20Fixed=20a?= =?UTF-8?q?=20crash=20in=20i18n=20character=20set=20conversion=20(thanks?= =?UTF-8?q?=20to=20Alexander=20Riedel,=20=20=20Jose=20Alberto=20Reguero=20?= =?UTF-8?q?and=20Christian=20Wieninger=20for=20patches=20that=20cured=20pa?= =?UTF-8?q?rt=20of=20=20=20the=20problem).=20-=20Adjusted=20the=20'skincur?= =?UTF-8?q?ses'=20plugin=20to=20UTF-8=20handling.=20-=20Using=20nl=5Flangi?= =?UTF-8?q?nfo(CODESET)=20to=20determine=20the=20local=20codeset=20to=20us?= =?UTF-8?q?e=20(thanks=20to=20=20=20Thomas=20G=C3=BCnther).=20The=20codese?= =?UTF-8?q?t=20names=20in=20'libsi/si.c'=20have=20been=20changed=20to=20th?= =?UTF-8?q?e=20=20=20canonical=20spelling=20with=20'-'=20(thanks=20to=20Lu?= =?UTF-8?q?dwig=20Nussel=20for=20pointing=20this=20out).=20-=20Modified=20?= =?UTF-8?q?handling=20invalid=20characters=20in=20VFAT=20mode.=20-=20Repla?= =?UTF-8?q?ced=20strn0cpy()=20with=20Utf8Strn0Cpy()=20where=20necessary.?= =?UTF-8?q?=20-=20Now=20using=20'fontconfig'=20to=20determine=20which=20fo?= =?UTF-8?q?nts=20to=20use=20(thanks=20to=20Anssi=20Hannula=20=20=20for=20c?= =?UTF-8?q?ode=20and=20hints=20on=20how=20to=20do=20this).=20-=20If=20no?= =?UTF-8?q?=20fonts=20are=20installed,=20VDR=20now=20uses=20a=20dummy=20fo?= =?UTF-8?q?nt=20that=20doesn't=20actually=20draw=20=20=20any=20text,=20and?= =?UTF-8?q?=20logs=20an=20error=20message.=20-=20The=20new=20function=20cF?= =?UTF-8?q?ont::CreateFont()=20can=20be=20used=20by=20plugins=20to=20creat?= =?UTF-8?q?e=20and=20use=20=20=20fonts=20of=20their=20own,=20independent?= =?UTF-8?q?=20of=20VDR's=20standard=20fonts.=20-=20Updated=20the=20Finnish?= =?UTF-8?q?=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20-=20Change?= =?UTF-8?q?d=20the=20parameter=20"OSD=20font"=20to=20"Default=20font"=20in?= =?UTF-8?q?=20"Setup/OSD"=20(suggested=20=20=20by=20Rolf=20Ahrenberg).=20-?= =?UTF-8?q?=20Fixed=20handling=20detached=20processes=20in=20SystemExec()?= =?UTF-8?q?=20(thanks=20to=20Udo=20Richter).=20-=20The=20info.vdr=20file?= =?UTF-8?q?=20now=20also=20stores=20the=20name=20of=20the=20channel,=20and?= =?UTF-8?q?=20the=20new=20function=20=20=20cRecordingInfo::ChannelName()?= =?UTF-8?q?=20returns=20this=20information=20if=20available=20(based=20on?= =?UTF-8?q?=20=20=20a=20patch=20from=20Alexander=20Hans).=20-=20The=20new?= =?UTF-8?q?=20function=20cOsd::SetOsdPosition()=20can=20be=20used=20to=20d?= =?UTF-8?q?ynamically=20change=20the=20=20=20position=20and=20size=20of=20?= =?UTF-8?q?the=20OSD=20(based=20on=20a=20request=20from=20Christoph=20Haub?= =?UTF-8?q?rich).=20=20=20Plugins=20that=20implement=20skins=20should=20no?= =?UTF-8?q?=20longer=20use=20Setup.OSDWidth=20etc.=20directly,=20=20=20but?= =?UTF-8?q?=20should=20rather=20use=20cOsd::OsdWidth()=20etc.=20instead.?= =?UTF-8?q?=20=20=20Currently=20a=20change=20to=20the=20OSD=20position=20w?= =?UTF-8?q?ill=20only=20apply=20to=20newly=20opened=20OSDs.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i18n.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'i18n.c') diff --git a/i18n.c b/i18n.c index 88832d7..fdeafc5 100644 --- a/i18n.c +++ b/i18n.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: i18n.c 1.294 2007/06/09 08:44:54 kls Exp $ + * $Id: i18n.c 1.297 2007/06/17 12:31:02 kls Exp $ * * Translations provided by: * @@ -3563,7 +3563,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Käytä antialiasointia", "",// TODO "",// TODO "",// TODO @@ -3578,15 +3578,15 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO }, - { "Setup.OSD$OSD font name", - "OSD Schriftart", - "",// TODO + { "Setup.OSD$Default font", + "Standard-Schriftart", "",// TODO "",// TODO "",// TODO "",// TODO "",// TODO "",// TODO + "Oletuskirjasintyyppi", "",// TODO "",// TODO "",// TODO @@ -3601,7 +3601,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO }, - { "Setup.OSD$Small font name", + { "Setup.OSD$Small font", "Kleine Schriftart", "",// TODO "",// TODO @@ -3609,7 +3609,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Pienikirjasintyyppi", "",// TODO "",// TODO "",// TODO @@ -3624,7 +3624,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO }, - { "Setup.OSD$Fixed font name", + { "Setup.OSD$Fixed font", "Festbreiten-Schriftart", "",// TODO "",// TODO @@ -3632,7 +3632,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Tasavälinen kirjasintyyppi", "",// TODO "",// TODO "",// TODO @@ -3655,7 +3655,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Oletuskirjasintyypin koko (px)", "",// TODO "",// TODO "",// TODO @@ -3678,7 +3678,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Pienen kirjasintyypin koko (px)", "",// TODO "",// TODO "",// TODO @@ -3701,7 +3701,7 @@ const tI18nPhrase Phrases[] = { "",// TODO "",// TODO "",// TODO - "",// TODO + "Tasavälisen kirjasintyypin koko (px)", "",// TODO "",// TODO "",// TODO @@ -6820,7 +6820,7 @@ static const char *ConvertPhrase(const tI18nPhrase *Original, tI18nPhrase **Conv *Converted = new tI18nPhrase[NumPhrases + 1]; memset(*Converted, 0, sizeof(tI18nPhrase) * (NumPhrases + 1)); } - if (!(*Converted)[NrPhrase][NrLanguage]) { + if (!(*Converted)[NrPhrase][NrLanguage] && Original[NrPhrase][NrLanguage]) { cCharSetConv csc(Phrases[1][NrLanguage], cCharSetConv::SystemCharacterTable()); (*Converted)[NrPhrase][NrLanguage] = strdup(csc.Convert(Original[NrPhrase][NrLanguage])); } @@ -6851,7 +6851,8 @@ const char *I18nTranslate(const char *s, const char *Plugin) return t; } } - p = Phrases; + p = OriginalPhrases = Phrases; + ConvertedPhrases = &Converted; } esyslog("%s%sno translation found for '%s' in language %d (%s)", Plugin ? Plugin : "", Plugin ? ": " : "", s, Setup.OSDLanguage, Phrases[0][Setup.OSDLanguage]); } -- cgit v1.2.3