- Philips: fixed error saving the Favorite.xml file (effects Philips "ChannelMap_105" and later file format versions)

- added Hungarian translation (credits to Istvan Krisko)
- Sony XML: fixed display of wrong DVB-C cable channel/transponder number
- LG webOS 5: unfortunately no news yet, but the insight that some "CX" models run on webOS 3.6 and others on 5.1, using
  different file formats.
This commit is contained in:
Horst Beham
2020-12-05 21:55:43 +01:00
parent 2c61c28b5f
commit 6584a666c6
43 changed files with 3491 additions and 80 deletions

View File

@@ -117,6 +117,7 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Resources.es.resx" />
<EmbeddedResource Include="Resources.hu.resx" />
<EmbeddedResource Include="Resources.pl.resx" />
<EmbeddedResource Include="Resources.pt.resx" />
<EmbeddedResource Include="Resources.resx">

View File

@@ -433,15 +433,15 @@ TRANSP;120;12728
DVBC;kHz;Channel
DVBC;73000;D73
DVBC;81000;D81
DVBC;106000;SE 1
DVBC;114000;SE 2
DVBC;123000;SE 3
DVBC;130000;SE 4
DVBC;138000;SE 5
DVBC;146000;SE 6
DVBC;154000;SE 7
DVBC;162000;SE 8
DVBC;170000;SE 9
DVBC;106000;S 01
DVBC;114000;S 02
DVBC;123000;S 03
DVBC;130000;S 04
DVBC;138000;S 05
DVBC;146000;S 06
DVBC;154000;S 07
DVBC;162000;S 08
DVBC;170000;S 09
DVBC;178000;5
DVBC;186000;6
DVBC;194000;7
1 SERVICETYPE Number Description
433 DVBC 106000 SE 1 S 01
434 DVBC 114000 SE 2 S 02
435 DVBC 123000 SE 3 S 03
436 DVBC 130000 SE 4 S 04
437 DVBC 138000 SE 5 S 05
438 DVBC 146000 SE 6 S 06
439 DVBC 154000 SE 7 S 07
440 DVBC 162000 SE 8 S 08
441 DVBC 170000 SE 9 S 09
442 DVBC 178000 5
443 DVBC 186000 6
444 DVBC 194000 7
445 DVBC 202000 8
446 DVBC 210000 9
447 DVBC 218000 10

View File

@@ -230,7 +230,12 @@ namespace ChanSort.Api
if (freqInMhz > 2000)
freqInMhz /= 1000;
return dvbcChannels.TryGet((int)(freqInMhz * 1000)) ?? dvbcChannels.TryGet((int)((freqInMhz-1) * 1000)) ?? "";
return dvbcChannels.TryGet((int)(freqInMhz * 1000))
?? dvbcChannels.TryGet((int)((freqInMhz - 1) * 1000))
?? dvbcChannels.TryGet((int)((freqInMhz - 2) * 1000))
?? dvbcChannels.TryGet((int)((freqInMhz + 1) * 1000))
?? dvbcChannels.TryGet((int)((freqInMhz + 2) * 1000))
?? "";
}
}
}

View File

@@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ChannelList_ProgramNrAssignedToMultipleChannels" xml:space="preserve">
<value>{0} A(z) #{1} program több csatornához van rendelve: index {2}='{3} és index {4}='{5}'</value>
</data>
<data name="ChannelList_AddChannel__DuplicateUid" xml:space="preserve">
<value>{0}: A(z) '{1}' csatornának több adatrekordja van: index {2}=Pr#{3} és index {4}=Pr#{5}</value>
</data>
</root>