iconv fixes

[melted] / src / modules / feeds / PAL / etv.properties

diff --git a/src/modules/feeds/PAL/etv.properties b/src/modules/feeds/PAL/etv.properties
index 2eaf41c..25bc45c 100644 (file)
--- a/src/modules/feeds/PAL/etv.properties
+++ b/src/modules/feeds/PAL/etv.properties
@@ -16,6 +16,8 @@
 location=region
 .description=Titles
 .properties.markup=filter[1].producer.markup
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .period=2
 .properties.length[0]=composite.out
 .composite.geometry=0,80:230x30:0;12=,:x:100
@@ -26,7 +28,8 @@ location=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=
-.filter[1].producer.font=Sans 24
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
 .filter[1].composite.geometry=0,0:95%x100%
 .filter[1].composite.titles=1
 .filter[1].composite.halign=right
@@ -35,6 +38,8 @@ location=region
 courtesy=region
 .description=Courtesy
 .properties.markup=filter[1].producer.markup
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .type.markup=text
 .period=2
 .properties.length[0]=composite.out
@@ -46,7 +51,8 @@ courtesy=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=ETV Exclusive
-.filter[1].producer.font=Sans 24
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
 .filter[1].composite.geometry=0,0:95%x100%
 .filter[1].composite.titles=1
 .filter[1].composite.halign=right
@@ -55,6 +61,8 @@ courtesy=region
 exclusive=region
 .description=Exclusive
 .properties.markup=filter[1].producer.markup
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .type.markup=text
 .period=2
 .properties.length[0]=composite.out
@@ -64,7 +72,8 @@ exclusive=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=ETV Exclusive
-.filter[1].producer.font=Sans 24
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
 .filter[1].producer.weight=700
 .filter[1].composite.geometry=0,0:95%x100%
 .filter[1].composite.titles=1
@@ -74,6 +83,8 @@ exclusive=region
 file_shot=region
 .description=Titles
 .period=2
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .properties.length[0]=composite.out
 .composite.geometry=590,160:80x25:0;12=,:x:100
 .filter[0]=watermark
@@ -81,7 +92,8 @@ file_shot=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=File Shot
-.filter[1].producer.font=Sans 18
+.filter[1].producer.font=Sans
+.filter[1].producer.size=18
 .filter[1].producer.weight=700
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
@@ -90,6 +102,8 @@ file_shot=region
 special=region
 .description=Special
 .period=2
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .properties.length[0]=filter[0].composite.out
 .properties.length[1]=filter[1].composite.out
 .composite.geometry=465,375:255x35
@@ -99,7 +113,8 @@ special=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Special
-.filter[1].producer.font=Sans 24
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
 .filter[1].producer.weight=700
 .filter[1].composite.geometry=100%,0%:100%x100%:0;12=0%,0%:x:100
 .filter[1].composite.titles=1
@@ -109,6 +124,8 @@ special=region
 ticker=region
 .description=Tickertape
 .properties.markup=filter[1].producer.markup
+.properties.font=filter[1].producer.font
+.properties.size=filter[1].producer.size
 .type.markup=text
 .properties.length[0]=filter[1].composite.out
 .composite.geometry=0,500:722x75
@@ -118,7 +135,8 @@ ticker=region
 .filter[1]=watermark
 .filter[1].resource=pango:
 .filter[1].producer.markup=Ticker - provided for reference
-.filter[1].producer.font=Sans 24
+.filter[1].producer.font=Sans
+.filter[1].producer.size=24
 .filter[1].producer.weight=700
 .filter[1].composite.titles=1
 .filter[1].composite.halign=centre
@@ -130,6 +148,10 @@ super=region
 .properties.1=filter[2].producer.markup
 .properties.align=filter[1].composite.valign
 .properties.weight=filter[1].producer.weight
+.properties.f0=filter[1].producer.font
+.properties.s0=filter[1].producer.size
+.properties.f1=filter[2].producer.font
+.properties.s1=filter[2].producer.size
 .properties.length[0]=composite.out
 .period=2
 .composite.geometry=0,410:720x90:0;25=,:x:100
@@ -141,8 +163,10 @@ super=region
 .filter[0].composite.geometry=0,0:100%:100%:70
 .filter[1]=watermark
 .filter[1].resource=pango:
+.filter[1].producer.encoding=iso8859-1
 .filter[1].producer.markup=
-.filter[1].producer.font=Sans 32
+.filter[1].producer.font=Sans
+.filter[1].producer.size=32
 .filter[1].producer.weight=700
 .filter[1].producer.fgcolour=0x6c0101ff
 .filter[1].composite.titles=1
@@ -150,8 +174,10 @@ super=region
 .filter[1].composite.valign=top
 .filter[2]=watermark
 .filter[2].resource=pango:
+.filter[2].producer.encoding=iso8859-1
 .filter[2].producer.markup=
-.filter[2].producer.font=Sans 32
+.filter[2].producer.font=Sans
+.filter[2].producer.size=32
 .filter[2].producer.fgcolour=0x6c0101ff
 .filter[2].composite.titles=1
 .filter[2].composite.halign=centre