mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 17:58:31 +02:00
Merge branch 'master' into plugininterface
This commit is contained in:
louis
commit
4204e45532
2
HISTORY
2
HISTORY
@ -190,3 +190,5 @@ Version 0.2.0
|
||||
|
||||
Version 0.2.1
|
||||
|
||||
- fixed bug that global tokens were not parsed correctly
|
||||
- added finnish translation
|
||||
|
||||
@ -73,12 +73,15 @@ void cGlobals::ReplaceIntVars(string &value) {
|
||||
stringstream sToken;
|
||||
sToken << "{" << it->first << "}";
|
||||
string token = sToken.str();
|
||||
size_t foundToken = value.find(token);
|
||||
if (foundToken != string::npos) {
|
||||
stringstream st;
|
||||
st << it->second;
|
||||
value = value.replace(foundToken, token.size(), st.str());
|
||||
}
|
||||
size_t foundToken = string::npos;
|
||||
do {
|
||||
foundToken = value.find(token);
|
||||
if (foundToken != string::npos) {
|
||||
stringstream st;
|
||||
st << it->second;
|
||||
value = value.replace(foundToken, token.size(), st.str());
|
||||
}
|
||||
} while (foundToken != string::npos);
|
||||
}
|
||||
}
|
||||
|
||||
@ -107,18 +110,21 @@ void cGlobals::ReplaceDoubleVars(string &value) {
|
||||
stringstream sToken;
|
||||
sToken << "{" << it->first << "}";
|
||||
string token = sToken.str();
|
||||
size_t foundToken = value.find(token);
|
||||
if (foundToken != string::npos) {
|
||||
stringstream st;
|
||||
st << it->second;
|
||||
string doubleVal = st.str();
|
||||
if (config.replaceDecPoint) {
|
||||
if (doubleVal.find_first_of('.') != string::npos) {
|
||||
std::replace( doubleVal.begin(), doubleVal.end(), '.', config.decPoint);
|
||||
size_t foundToken = string::npos;
|
||||
do {
|
||||
foundToken = value.find(token);
|
||||
if (foundToken != string::npos) {
|
||||
stringstream st;
|
||||
st << it->second;
|
||||
string doubleVal = st.str();
|
||||
if (config.replaceDecPoint) {
|
||||
if (doubleVal.find_first_of('.') != string::npos) {
|
||||
std::replace( doubleVal.begin(), doubleVal.end(), '.', config.decPoint);
|
||||
}
|
||||
}
|
||||
value = value.replace(foundToken, token.size(), doubleVal);
|
||||
}
|
||||
value = value.replace(foundToken, token.size(), doubleVal);
|
||||
}
|
||||
} while (foundToken != string::npos);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
34
po/de_DE.po
34
po/de_DE.po
@ -24,17 +24,29 @@ msgstr "alle auf einmal"
|
||||
msgid "Skin"
|
||||
msgstr ""
|
||||
|
||||
msgid "Plugin Setup"
|
||||
msgstr ""
|
||||
|
||||
msgid "Menu Item display method"
|
||||
msgstr "Art der Ausgabe der Menüelemente"
|
||||
|
||||
msgid "Reruns"
|
||||
msgstr "Wiederholungen"
|
||||
|
||||
msgid "Maximum number of reruns to display"
|
||||
msgstr "Anzahl anzuzeigender Wiederholungen"
|
||||
|
||||
msgid "Minimum timely distance of rerun (in hours)"
|
||||
msgstr "Zeitl. Abstand der Wiederholung (in h)"
|
||||
|
||||
msgid "Limit Channel Numbers (0 = no limit)"
|
||||
msgstr "Kanalnummern begrenzen (0 = unbegrenzt)"
|
||||
msgid "Limit Channel Numbers"
|
||||
msgstr "Kanalnummern begrenzen"
|
||||
|
||||
msgid "no limit"
|
||||
msgstr "unbegrenzt"
|
||||
|
||||
msgid "Image Loading"
|
||||
msgstr "Bilder"
|
||||
|
||||
msgid "Debug Image Loading"
|
||||
msgstr "Debugausgabe für das Laden der Bilder"
|
||||
@ -48,9 +60,15 @@ msgstr "Anzahl der initial zu cachenden Logos"
|
||||
msgid "Number to cache in maximum"
|
||||
msgstr "Maximale Anzahl zu cachender Logos"
|
||||
|
||||
msgid "has no setup"
|
||||
msgid "Skin Setup"
|
||||
msgstr ""
|
||||
|
||||
msgid "has no setup"
|
||||
msgstr "hat kein Setup"
|
||||
|
||||
msgid "Cache Statistics"
|
||||
msgstr "Cache Statistik"
|
||||
|
||||
msgid "cached"
|
||||
msgstr "cached"
|
||||
|
||||
@ -69,11 +87,5 @@ msgstr "Logos"
|
||||
msgid "skinparts"
|
||||
msgstr "Skinparts"
|
||||
|
||||
#~ msgid "Reruns"
|
||||
#~ msgstr "Wiederholungen"
|
||||
|
||||
#~ msgid "Image Loading"
|
||||
#~ msgstr "Bilder"
|
||||
|
||||
#~ msgid "Cache Statistics"
|
||||
#~ msgstr "Cache Statistik"
|
||||
msgid "Skin Designer"
|
||||
msgstr "Skin Designer"
|
||||
|
||||
91
po/fi_FI.po
Normal file
91
po/fi_FI.po
Normal file
@ -0,0 +1,91 @@
|
||||
# Copyright (C) 2014-2015
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# Rolf Ahrenberg <rolf.ahrenberg@sci.fi>, 2015.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: vdr-skindesigner 0.2.0\n"
|
||||
"Report-Msgid-Bugs-To: <see README>\n"
|
||||
"POT-Creation-Date: 2015-01-25 01:25+0200\n"
|
||||
"PO-Revision-Date: 2015-01-25 01:25+0200\n"
|
||||
"Last-Translator: Rolf Ahrenberg\n"
|
||||
"Language-Team: Finnish\n"
|
||||
"Language: fi\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
msgid "after one another"
|
||||
msgstr "yksi kerrallaan"
|
||||
|
||||
msgid "at one go"
|
||||
msgstr "kaikki kerralla"
|
||||
|
||||
msgid "Skin"
|
||||
msgstr "Ulkoasu"
|
||||
|
||||
msgid "Plugin Setup"
|
||||
msgstr "Yleiset"
|
||||
|
||||
msgid "Menu Item display method"
|
||||
msgstr "Valikkorivien esitystapa"
|
||||
|
||||
msgid "Reruns"
|
||||
msgstr "Uusinnat"
|
||||
|
||||
msgid "Maximum number of reruns to display"
|
||||
msgstr "Maksimissaan näytettävät uusinnat"
|
||||
|
||||
msgid "Minimum timely distance of rerun (in hours)"
|
||||
msgstr "Minimikesto uusintojen välillä [h]"
|
||||
|
||||
msgid "Limit Channel Numbers"
|
||||
msgstr "Aseta rajoitus kanavanumeroille"
|
||||
|
||||
msgid "no limit"
|
||||
msgstr "ei rajoitusta"
|
||||
|
||||
msgid "Image Loading"
|
||||
msgstr "Kuvat"
|
||||
|
||||
msgid "Debug Image Loading"
|
||||
msgstr "Debuggaa kuvien latausta"
|
||||
|
||||
msgid "Limit Channel Logo Cache"
|
||||
msgstr "Rajoita kanavalogojen välimuistia"
|
||||
|
||||
msgid "Number to cache initially (per size)"
|
||||
msgstr "Oletuksena välimuistissa pidettävät logot"
|
||||
|
||||
msgid "Number to cache in maximum"
|
||||
msgstr "Maksimissaan välimuistissa pidettävät logot"
|
||||
|
||||
msgid "Skin Setup"
|
||||
msgstr "Ulkoasut"
|
||||
|
||||
msgid "has no setup"
|
||||
msgstr "ei asetuksia"
|
||||
|
||||
msgid "Cache Statistics"
|
||||
msgstr "Välimuisti"
|
||||
|
||||
msgid "cached"
|
||||
msgstr "välimuistissa"
|
||||
|
||||
msgid "icons"
|
||||
msgstr "ikoni(a)"
|
||||
|
||||
msgid "size"
|
||||
msgstr "koko"
|
||||
|
||||
msgid "byte"
|
||||
msgstr "tavu(a)"
|
||||
|
||||
msgid "logos"
|
||||
msgstr "logo(a)"
|
||||
|
||||
msgid "skinparts"
|
||||
msgstr "osasta"
|
||||
|
||||
msgid "Skin Designer"
|
||||
msgstr "Skin Designer -ulkoasu"
|
||||
16
setup.c
16
setup.c
@ -97,16 +97,16 @@ cOsdItem *cSkinDesignerSetup::InfoItem(const char *label) {
|
||||
}
|
||||
|
||||
void cSkinDesignerSetup::PluginSetup(void) {
|
||||
Add(InfoItem("Plugin Setup"));
|
||||
Add(InfoItem(tr("Plugin Setup")));
|
||||
|
||||
Add(new cMenuEditStraItem(tr("Menu Item display method"), &blockFlush, 2, menuDisplayStyle));
|
||||
|
||||
Add(InfoItem("Reruns"));
|
||||
Add(InfoItem(tr("Reruns")));
|
||||
Add(new cMenuEditIntItem(tr("Maximum number of reruns to display"), &rerunAmount, 1, 100));
|
||||
Add(new cMenuEditIntItem(tr("Minimum timely distance of rerun (in hours)"), &rerunDistance, 0, 1000));
|
||||
Add(new cMenuEditIntItem(tr("Limit Channel Numbers (0 = no limit)"), &rerunMaxChannel, 0, 1000));
|
||||
Add(new cMenuEditIntItem(tr("Limit Channel Numbers"), &rerunMaxChannel, 0, 1000, tr("no limit")));
|
||||
|
||||
Add(InfoItem("Image Loading"));
|
||||
Add(InfoItem(tr("Image Loading")));
|
||||
Add(new cMenuEditBoolItem(tr("Debug Image Loading"), &debugImageLoading));
|
||||
Add(new cMenuEditBoolItem(tr("Limit Channel Logo Cache"), &limitLogoCache));
|
||||
Add(new cMenuEditIntItem(tr("Number to cache initially (per size)"), &numLogosPerSizeInitial, 0, 1000));
|
||||
@ -114,14 +114,14 @@ void cSkinDesignerSetup::PluginSetup(void) {
|
||||
}
|
||||
|
||||
void cSkinDesignerSetup::SkinSetup(void) {
|
||||
Add(InfoItem("Skin Setup"));
|
||||
Add(InfoItem(tr("Skin Setup")));
|
||||
|
||||
config.InitSkinIterator();
|
||||
string skin = "";
|
||||
while (config.GetSkin(skin)) {
|
||||
cSkinSetup *skinSetup = config.GetSkinSetup(skin);
|
||||
if (!skinSetup) {
|
||||
Add(new cOsdItem(cString::sprintf("%s %s %s", tr("Skin"), skin.c_str(), tr("has no setup"))));
|
||||
Add(new cOsdItem(cString::sprintf("%s %s\t%s", tr("Skin"), skin.c_str(), tr("has no setup"))));
|
||||
cList<cOsdItem>::Last()->SetSelectable(false);
|
||||
} else {
|
||||
Add(new cOsdItem(cString::sprintf("%s %s", tr("Skin"), skin.c_str())));
|
||||
@ -134,7 +134,7 @@ void cSkinDesignerSetup::ImageCacheStatistics(void) {
|
||||
return;
|
||||
}
|
||||
|
||||
Add(InfoItem("Cache Statistics"));
|
||||
Add(InfoItem(tr("Cache Statistics")));
|
||||
int sizeIconCache = 0;
|
||||
int numIcons = 0;
|
||||
imgCache->GetIconCacheSize(numIcons, sizeIconCache);
|
||||
@ -195,4 +195,4 @@ void cSkindesignerSkinSetup::Set(void) {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,8 +20,7 @@
|
||||
|
||||
|
||||
static const char *VERSION = "0.2.1";
|
||||
static const char *DESCRIPTION = "SkinDesigner";
|
||||
static const char *MAINMENUENTRY = "Skin Designer";
|
||||
static const char *DESCRIPTION = trNOOP("Skin Designer");
|
||||
|
||||
class cPluginSkinDesigner : public cPlugin {
|
||||
private:
|
||||
@ -30,7 +29,7 @@ public:
|
||||
cPluginSkinDesigner(void);
|
||||
virtual ~cPluginSkinDesigner();
|
||||
virtual const char *Version(void) { return VERSION; }
|
||||
virtual const char *Description(void) { return DESCRIPTION; }
|
||||
virtual const char *Description(void) { return tr(DESCRIPTION); }
|
||||
virtual const char *CommandLineHelp(void);
|
||||
virtual bool ProcessArgs(int argc, char *argv[]);
|
||||
virtual bool Initialize(void);
|
||||
|
||||
@ -30,34 +30,42 @@
|
||||
<token name="tr(showdevices)">
|
||||
<trans lang="en_EN">Show DVB device info when switching channel</trans>
|
||||
<trans lang="de_DE">DVB Karten Info beim Umschalten anzeigen</trans>
|
||||
<trans lang="fi_FI">Näytä DVB-tiedot kanavanvaihdossa</trans>
|
||||
</token>
|
||||
<token name="tr(showpostertext)">
|
||||
<trans lang="en_EN">Show Poster when switching channel</trans>
|
||||
<trans lang="de_DE">Poster beim Umschalten anzeigen</trans>
|
||||
<trans lang="fi_FI">Näytä posterit kanavanvaihdossa</trans>
|
||||
</token>
|
||||
<token name="tr(showmainmenuicons)">
|
||||
<trans lang="en_EN">Show Icons in Main Menu</trans>
|
||||
<trans lang="de_DE">Icons im Hauptmenü anzeigen</trans>
|
||||
<trans lang="fi_FI">Näytä ikonit päävalikossa</trans>
|
||||
</token>
|
||||
<token name="tr(fadetext)">
|
||||
<trans lang="en_EN">Fade time in ms (needs VDR restart)</trans>
|
||||
<trans lang="de_DE">Einblendzeit in ms (erfordert VDR Neustart)</trans>
|
||||
<trans lang="fi_FI">Häivytyksen kesto [ms] (uud.käynnistys)</trans>
|
||||
</token>
|
||||
<token name="tr(nummenuitemsmain)">
|
||||
<trans lang="en_EN">Items in main menu (needs VDR restart)</trans>
|
||||
<trans lang="de_DE">Elemente im Hauptmenü (erfordert VDR Neustart)</trans>
|
||||
<trans lang="fi_FI">Valinnat päävalikossa (uud.käynnistys)</trans>
|
||||
</token>
|
||||
<token name="tr(nummenuitems)">
|
||||
<trans lang="en_EN">Items in sdchedules, timers, ... menus (needs VDR restart)</trans>
|
||||
<trans lang="en_EN">Items in schedules, timers, ... menus (needs VDR restart)</trans>
|
||||
<trans lang="de_DE">Elemente in Programm, Timer, ... Menüs (erfordert VDR Neustart)</trans>
|
||||
<trans lang="fi_FI">Valinnat alivalikoissa (uud.käynnistys)</trans>
|
||||
</token>
|
||||
<token name="tr(nummenuitemsdefault)">
|
||||
<trans lang="en_EN">Items in default list menu (needs VDR restart)</trans>
|
||||
<trans lang="de_DE">Elemente im Standard ListenMenü (erfordert VDR Neustart)</trans>
|
||||
<trans lang="fi_FI">Valinnat valikkolistoissa (uud.käynnistys)</trans>
|
||||
</token>
|
||||
<token name="tr(showsubtitle)">
|
||||
<trans lang="en_EN">Show shorttexts in schedules menus</trans>
|
||||
<trans lang="de_DE">Kurztexte im Programm Menü anzeigen</trans>
|
||||
<trans lang="fi_FI">Näytä lyhyet kuvaukset ohjelmaoppaassa</trans>
|
||||
</token>
|
||||
</translations>
|
||||
</setup>
|
||||
|
||||
@ -24,10 +24,12 @@
|
||||
<token name="tr(fadetext)">
|
||||
<trans lang="en_EN">Fade time in ms (needs VDR restart)</trans>
|
||||
<trans lang="de_DE">Einblendzeit in ms (erfordert VDR Neustart)</trans>
|
||||
<trans lang="fi_FI">Häivytyksen kesto [ms] (uud.käynnistys)</trans>
|
||||
</token>
|
||||
<token name="tr(showdevices)">
|
||||
<trans lang="en_EN">Show DVB device info when switching channel</trans>
|
||||
<trans lang="de_DE">DVB Karten Info beim Umschalten anzeigen</trans>
|
||||
<trans lang="fi_FI">Näytä DVB-tiedot kanavanvaihdossa</trans>
|
||||
</token>
|
||||
</translations>
|
||||
</setup>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user