- experimental support for Grundig and ChangHong atv\_cmdb.bin files (analog antenna and cable TV)

- Reference list dialog further optimized to fit 1920x1080 @150% or 1024x768 @100% screens - re-imported translation file (to fix incorrect letters in language names like "Русский") - upgrade to DevExpress 22.1 libraries
2026-02-08 23:46:46 +01:00 · 2022-07-03 21:48:12 +02:00
parent 76d88c63cc
commit f522adad0a
47 changed files with 1132 additions and 602 deletions
--- a/source/ChanSort.Api/Model/ChannelList.cs
+++ b/source/ChanSort.Api/Model/ChannelList.cs
@@ -6,9 +6,9 @@ namespace ChanSort.Api
 {
  public class ChannelList
  {
-    private readonly Dictionary<string, IList<ChannelInfo>> channelByUid = new Dictionary<string, IList<ChannelInfo>>();
-    private readonly Dictionary<int, ChannelInfo> channelByProgNr = new Dictionary<int, ChannelInfo>();
-    private readonly Dictionary<string, IList<ChannelInfo>> channelByName = new Dictionary<string, IList<ChannelInfo>>();
+    private readonly Dictionary<string, IList<ChannelInfo>> channelByUid = new ();
+    private readonly Dictionary<int, ChannelInfo> channelByProgNr = new ();
+    private readonly Dictionary<string, IList<ChannelInfo>> channelByName = new ();
    private int insertProgramNr = 1;
    private int duplicateUidCount;
    private int duplicateProgNrCount;
@@ -138,6 +138,7 @@ namespace ChanSort.Api
    #region GetChannelByName()
    public IEnumerable<ChannelInfo> GetChannelByName(string name)
    {
+      name ??= "";
      var hits = this.channelByName.TryGet(name.ToLowerInvariant().Trim());
      return hits ?? new List<ChannelInfo>();
    }
--- a/source/ChanSort.Api/Model/LookupData.cs
+++ b/source/ChanSort.Api/Model/LookupData.cs
@@ -159,10 +159,10 @@ namespace ChanSort.Api
    {
      if (fields.Count < 3)
        return;
-      int freq;
-      int.TryParse(fields[1], out freq);
+      int.TryParse(fields[1], out var freq);
      if (freq == 0)
        return;
+      freq /= 1000;
      this.dvbcChannels[freq] = fields[2];
    }
    #endregion
@@ -231,11 +231,13 @@ namespace ChanSort.Api
      if (freqInMhz > 2000)
        freqInMhz /= 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))
+      return dvbcChannels.TryGet((int)freqInMhz) 
+             ?? dvbcChannels.TryGet((int)freqInMhz - 1)
+             ?? dvbcChannels.TryGet((int)freqInMhz - 2)
+             //?? dvbcChannels.TryGet((int)freqInMhz - 3)
+             ?? dvbcChannels.TryGet((int)freqInMhz + 1)
+             ?? dvbcChannels.TryGet((int)freqInMhz + 2)
+             //?? dvbcChannels.TryGet((int)freqInMhz + 3)
             ?? "";      
    }
  }
--- a/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.csproj
+++ b/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.csproj
@@ -21,6 +21,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@@ -29,6 +30,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini
+++ b/source/ChanSort.Loader.CmdbBin/ChanSort.Loader.CmdbBin.ini
@@ -124,6 +124,29 @@ offName=144
 lenName=50


+
+# H.P. 20220608 Grundig 1341 KB dtv_cmdb_3.bin (only analog data in atv_cmdb_cable.bin is present)
+[atv_cmdb.bin:3148]
+offProgNrList=0x01
+lenProgNrList=100
+offChannelBitmap=0x66
+lenChannelBitmap=13
+offChannelRecord=0x74
+lenChannelRecord=30
+[atv_cmdb_cable.bin:3148]
+offProgNrList=0x01
+lenProgNrList=101
+offChannelBitmap=0x66
+lenChannelBitmap=13
+offChannelRecord=0x74
+lenChannelRecord=30
+[avbChannel:30]
+offFrequency=0
+offSort=14
+offName=16
+lenName=8
+
+
 # ChangHong 1489 KB

 [dtv_cmdb_2.bin:1524001]
@@ -280,6 +303,25 @@ offName=2
 lenName=22
 offOrbitalPos=38

+[atv_cmdb.bin:13092]
+offProgNrList=0x01
+lenProgNrList=256
+offChannelBitmap=0x101
+lenChannelBitmap=32
+offChannelRecord=0x121
+lenChannelRecord=50
+[atv_cmdb_cable.bin:13092]
+offProgNrList=0x01
+lenProgNrList=256
+offChannelBitmap=0x101
+lenChannelBitmap=32
+offChannelRecord=0x121
+lenChannelRecord=50
+[avbChannel:50]
+;offFrequency=0
+;offSort=14
+offName=15
+lenName=28


 # blackbox - 4532 KB
--- a/source/ChanSort.Loader.CmdbBin/CmdbFileSerializer.cs
+++ b/source/ChanSort.Loader.CmdbBin/CmdbFileSerializer.cs
@@ -1,6 +1,7 @@
 using System;
-using System.CodeDom;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using ChanSort.Api;

@@ -9,19 +10,25 @@ namespace ChanSort.Loader.CmdbBin
  public class CmdbFileSerializer : SerializerBase
  {
    private IniFile ini;
-    private readonly ChannelList dvbsTv = new ChannelList(SignalSource.DvbS | SignalSource.Tv, "Sat TV");
-    private readonly ChannelList dvbsRadio = new ChannelList(SignalSource.DvbS | SignalSource.Radio, "Sat Radio");
-    private readonly ChannelList dvbsData = new ChannelList(SignalSource.DvbS | SignalSource.Radio, "Sat Data");
+    private readonly List<string> files = new();
+    private readonly ChannelList avbtTv = new (SignalSource.AnalogT | SignalSource.Tv, "Analog Antenna TV");
+    private readonly ChannelList avbcTv = new (SignalSource.AnalogC | SignalSource.Tv, "Analog Cable TV");
+    private readonly ChannelList dvbsTv = new (SignalSource.DvbS | SignalSource.Tv, "Sat TV");
+    private readonly ChannelList dvbsRadio = new (SignalSource.DvbS | SignalSource.Radio, "Sat Radio");
+    private readonly ChannelList dvbsData = new (SignalSource.DvbS | SignalSource.Radio, "Sat Data");
    private DvbStringDecoder dvbStringDecoder;
    private bool loaded;
-    private readonly StringBuilder protocol = new StringBuilder();
+    private readonly StringBuilder protocol = new ();

    public CmdbFileSerializer(string inputFile) : base(inputFile)
    {
      this.Features.FavoritesMode = FavoritesMode.Flags;
      this.Features.MaxFavoriteLists = 1;
      this.Features.DeleteMode = DeleteMode.FlagWithoutPrNr; // TODO there can be lots of channels in each list with number 65534, which seems to indicate user-deleted
+      this.Features.ChannelNameEdit = ChannelNameEditMode.Analog;

+      this.DataRoot.AddChannelList(avbtTv);
+      this.DataRoot.AddChannelList(avbcTv);
      this.DataRoot.AddChannelList(dvbsTv);
      this.DataRoot.AddChannelList(dvbsRadio);
      // this.DataRoot.AddChannelList(dvbsData); // there seem to be multiple data lists with Toshiba TVs which all have their own numbering starting at 1. Better don't show data channels at all than dupes
@@ -52,6 +59,12 @@ namespace ChanSort.Loader.CmdbBin
          case "dtv_cmdb_2.bin":
            LoadFile(file, this.dvbsTv, this.dvbsRadio, this.dvbsData);
            break;
+          case "atv_cmdb.bin":
+            LoadFile(file, this.avbtTv, null, null);
+            break;
+          case "atv_cmdb_cable.bin":
+            LoadFile(file, this.avbcTv, null, null);
+            break;
        }
      }

@@ -73,25 +86,46 @@ namespace ChanSort.Loader.CmdbBin
        return;
      }

-      LoadBitmappedRecords(data, sec, "Satellite", ReadSatellite);
-      LoadBitmappedRecords(data, sec, "Transponder", ReadTransponder);
-      LoadBitmappedRecords(data, sec, "Channel", (map, index, len) => ReadChannel(map, tvList, radioList, dataList, index, len));
+      if ((tvList.SignalSource & SignalSource.Analog) != 0)
+      {
+        var seq = LoadAnalogProgramNumbers(data, sec);
+        LoadBitmappedRecords(data, sec, "avb", "Channel", (map, index, len) => ReadAnalogChannel(map, tvList, seq, index, len));
+      }
+      else
+      {
+        LoadBitmappedRecords(data, sec, "dvbs", "Satellite", ReadSatellite);
+        LoadBitmappedRecords(data, sec, "dvbs", "Transponder", ReadTransponder);
+        LoadBitmappedRecords(data, sec, "dvbs", "Channel", (map, index, len) => ReadDigitalChannel(map, tvList, radioList, dataList, index, len));
+      }

      this.loaded = true;
+      this.files.Add(file);
    }
    #endregion

+    #region LoadAnalogProgramNumbers()
+    private byte[] LoadAnalogProgramNumbers(byte[] data, IniFile.Section sec)
+    {
+      var off = sec.GetInt("offProgNrList");
+      var len = sec.GetInt("lenProgNrList");
+      var bytes = new byte[len];
+      Array.Copy(data, off, bytes, 0, len);
+      return bytes;
+    }
+
+    #endregion
+
    #region LoadBitmappedRecords()
-    private void LoadBitmappedRecords(byte[] data, IniFile.Section sec, string recordType, Action<DataMapping, int, int> readRecord)
+    private void LoadBitmappedRecords(byte[] data, IniFile.Section sec, string recordSectionPrefix, string recordType, Action<DataMapping, int, int> readRecord)
    {
      var lenRecord = sec.GetInt($"len{recordType}Record");
-      var map = new DataMapping(this.ini.GetSection($"dvbs{recordType}:{lenRecord}"));
+      var map = new DataMapping(this.ini.GetSection($"{recordSectionPrefix}{recordType}:{lenRecord}"));
      map.DefaultEncoding = this.DefaultEncoding;
      map.SetDataPtr(data, sec.GetInt($"off{recordType}Record"));

      var off = sec.GetInt($"off{recordType}Bitmap");
      var len = sec.GetInt($"len{recordType}Bitmap");
-      var count = sec.GetInt($"num{recordType}Record");
+      var count = sec.GetInt($"num{recordType}Record", short.MaxValue);
      int index = 0;
      for (int i = 0; i < len; i++)
      {
@@ -101,7 +135,8 @@ namespace ChanSort.Loader.CmdbBin
          if ((b & mask) != 0)
            readRecord(map, index, lenRecord);
          map.BaseOffset += lenRecord;
-          if (++index >= count)
+          ++index;
+          if (index >= count)
            break;
        }
      }
@@ -132,9 +167,23 @@ namespace ChanSort.Loader.CmdbBin
      this.DataRoot.AddTransponder(tp.Satellite, tp);
    }
    #endregion
+    
+    #region ReadAnalogChannel
+    private void ReadAnalogChannel(DataMapping chanMap, ChannelList list, byte[] progNrList, int recordIndex, int recordLength)
+    {
+      var channelNameLength = chanMap.Settings.GetInt("lenName");
+      var name = chanMap.GetString("offName", channelNameLength).TrimEnd(new[] { '\0', ' ' });
+      var progNr = Array.IndexOf(progNrList, (byte)recordIndex) + 1;
+      var ch = new ChannelInfo(list.SignalSource, recordIndex, progNr, name);
+      ch.FreqInMhz = (decimal)chanMap.GetWord("offFrequency") * 50 / 1000;
+      //if ((list.SignalSource & SignalSource.Cable) != 0)
+      //  ch.ChannelOrTransponder = LookupData.Instance.GetDvbcChannelName(ch.FreqInMhz + ((list.SignalSource & SignalSource.Analog) != 0 ? 2.75m : 0)); // 
+      this.DataRoot.AddChannel(list, ch);
+    }
+    #endregion

-    #region ReadChannel()
-    private void ReadChannel(DataMapping chanMap, ChannelList tvList, ChannelList radioList, ChannelList dataList, int recordIndex, int recordLength)
+    #region ReadDigitalChannel()
+    private void ReadDigitalChannel(DataMapping chanMap, ChannelList tvList, ChannelList radioList, ChannelList dataList, int recordIndex, int recordLength)
    {
      var channelType = (int)chanMap.GetByte("offChannelType");
      if (channelType == 0) // some file format versions store the channel type in the upper nibble of a byte
@@ -223,16 +272,38 @@ namespace ChanSort.Loader.CmdbBin


    #region Save()
+
    public override void Save(string tvOutputFile)
    {
-      // save-as is not supported
+      // save-as is not supported, the tvOutputFile is ignored

-      // TODO: currently hardcoded to support only dtv_cmdb_2.bin
+      foreach (var path in this.files)
+      {
+        var name = Path.GetFileName(path).ToLowerInvariant();
+        switch (name)
+        {
+          case "dtv_cmdb_2.bin":
+            SaveDtvCmdb(path, "dvbsChannel", SignalSource.DvbS);
+            break;
+          case "atv_cmdb.bin":
+            SaveAtvCmdb(path, "avbChannel", this.avbtTv);
+            break;
+          case "atv_cmdb_cable.bin":
+            SaveAtvCmdb(path, "avbChannel", this.avbcTv);
+            break;
+        }
+      }
+    }
+    #endregion

-      var data = File.ReadAllBytes(this.FileName); // filename is currently always the dtv_cmdb_2.bin, even if the user selected another file
-      var config = this.ini.GetSection("dtv_cmdb_2.bin:" + data.Length);
+    #region SaveDtvCmdb()
+    private void SaveDtvCmdb(string path, string channelSectionName, SignalSource sourceMask)
+    {
+      var data = File.ReadAllBytes(path);
+      var name = Path.GetFileName(path).ToLowerInvariant();
+      var config = this.ini.GetSection(name + ":" + data.Length);
      var lenChannelRecord = config.GetInt("lenChannelRecord");
-      var sec = this.ini.GetSection($"dvbsChannel:{lenChannelRecord}");
+      var sec = this.ini.GetSection($"{channelSectionName}:{lenChannelRecord}");
      sec.Set("offChecksum", lenChannelRecord - 4);
      var mapping = new DataMapping(sec);
      
@@ -240,6 +311,8 @@ namespace ChanSort.Loader.CmdbBin

      foreach (var list in this.DataRoot.ChannelLists)
      {
+        if ((list.SignalSource & (SignalSource.MaskAnalogDigital | SignalSource.MaskAntennaCableSat)) != sourceMask)
+          continue;
        foreach (var chan in list.Channels)
        {
          mapping.SetDataPtr(data, baseOffset + (int)chan.RecordIndex * lenChannelRecord);
@@ -262,6 +335,48 @@ namespace ChanSort.Loader.CmdbBin
    }
    #endregion

+    #region SaveAtvCmdb()
+    private void SaveAtvCmdb(string path, string channelSectionName, ChannelList list)
+    {
+      var data = File.ReadAllBytes(path);
+      var name = Path.GetFileName(path).ToLowerInvariant();
+      var config = this.ini.GetSection(name + ":" + data.Length);
+      var lenChannelRecord = config.GetInt("lenChannelRecord");
+
+      var offProgNrList = config.GetInt("offProgNrList");
+      var lenProgNrList = config.GetInt("lenProgNrList");
+      
+
+      var sec = this.ini.GetSection($"{channelSectionName}:{lenChannelRecord}");
+      var mapping = new DataMapping(sec);
+      var offChannelBitmap = config.GetInt("offChannelBitmap");
+      var offChannelRecord = config.GetInt("offChannelRecord");
+
+      var maxNameLen = mapping.Settings.GetInt("lenName");
+
+      data.MemSet(offProgNrList, 0xFD, lenProgNrList);
+
+      foreach (var chan in list.Channels)
+      {
+        if (chan.NewProgramNr > 0 && chan.NewProgramNr < lenProgNrList)
+          data[offProgNrList + chan.NewProgramNr - 1] = (byte)chan.RecordIndex;
+
+        if (chan.IsNameModified)
+        {
+          mapping.SetDataPtr(data, offChannelRecord + (int)chan.RecordIndex * lenChannelRecord);
+          mapping.SetString("offName", chan.Name, maxNameLen);
+        }
+
+        if (chan.IsDeleted)
+        {
+          var idx = (int)chan.RecordIndex;
+          data[offChannelBitmap + idx / 8] &= (byte) ~(1 << (idx & 0x07));
+        }
+      }
+
+      File.WriteAllBytes(path, data);
+    }
+    #endregion

    #region GetFileInformation()
    public override string GetFileInformation()
@@ -269,5 +384,7 @@ namespace ChanSort.Loader.CmdbBin
      return base.GetFileInformation() + "\n\n" + protocol;
    }
    #endregion
+
+    public override IEnumerable<string> GetDataFilePaths() => this.files.ToList(); // these files will be backed up / restored
  }
 }
--- a/source/ChanSort.Loader.Grundig/GrundigPlugin.cs
+++ b/source/ChanSort.Loader.Grundig/GrundigPlugin.cs
@@ -1,16 +1,15 @@
 using ChanSort.Api;

-namespace ChanSort.Loader.Grundig
-{
-  public class GrundigPlugin : ISerializerPlugin
-  {
-    public string DllName { get; set; }
-    public string PluginName => "Grundig (dvb*_config.xml)";
-    public string FileFilter => "*.xml";
+namespace ChanSort.Loader.Grundig;

-    public SerializerBase CreateSerializer(string inputFile)
-    {
-      return new Serializer(inputFile);
-    }
+public class GrundigPlugin : ISerializerPlugin
+{
+  public string DllName { get; set; }
+  public string PluginName => "Grundig (dvb*_config.xml)";
+  public string FileFilter => "*.xml";
+
+  public SerializerBase CreateSerializer(string inputFile)
+  {
+    return new Serializer(inputFile);
  }
-}
+}
--- a/source/ChanSort.Loader.LG.UI/ChanSort.Loader.LG.UI.csproj
+++ b/source/ChanSort.Loader.LG.UI/ChanSort.Loader.LG.UI.csproj
@@ -33,9 +33,15 @@
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Program Files\DevExpress 22.1\Components\Bin\Framework\DevExpress.Data.Desktop.v22.1.dll</HintPath>
+    </Reference>
+    <Reference Include="DevExpress.Drawing.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="System" />
    <Reference Include="System.Core" />
    <Reference Include="System.Drawing" />
--- a/source/ChanSort.Loader.LG.UI/PresetProgramNrDialog.resx
+++ b/source/ChanSort.Loader.LG.UI/PresetProgramNrDialog.resx
@@ -121,8 +121,8 @@
  <data name="labelControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="labelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="labelControl1.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -143,7 +143,7 @@
    <value>labelControl1</value>
  </data>
  <data name="&gt;&gt;labelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -157,7 +157,7 @@
  <data name="labelControl3.Appearance.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 8.25pt, style=Bold</value>
  </data>
-  <data name="labelControl3.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl3.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl3.Location" type="System.Drawing.Point, System.Drawing">
@@ -176,7 +176,7 @@
    <value>labelControl3</value>
  </data>
  <data name="&gt;&gt;labelControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl3.Parent" xml:space="preserve">
    <value>$this</value>
@@ -190,7 +190,7 @@
  <data name="labelControl4.Appearance.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 8.25pt, style=Bold</value>
  </data>
-  <data name="labelControl4.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl4.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl4.Location" type="System.Drawing.Point, System.Drawing">
@@ -209,7 +209,7 @@
    <value>labelControl4</value>
  </data>
  <data name="&gt;&gt;labelControl4.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl4.Parent" xml:space="preserve">
    <value>$this</value>
@@ -220,7 +220,7 @@
  <data name="labelControl5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
  </data>
-  <data name="labelControl5.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl5.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl5.Location" type="System.Drawing.Point, System.Drawing">
@@ -239,7 +239,7 @@
    <value>labelControl5</value>
  </data>
  <data name="&gt;&gt;labelControl5.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl5.Parent" xml:space="preserve">
    <value>$this</value>
@@ -250,7 +250,7 @@
  <data name="labelControl6.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
  </data>
-  <data name="labelControl6.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl6.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl6.Location" type="System.Drawing.Point, System.Drawing">
@@ -269,7 +269,7 @@
    <value>labelControl6</value>
  </data>
  <data name="&gt;&gt;labelControl6.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl6.Parent" xml:space="preserve">
    <value>$this</value>
@@ -280,7 +280,7 @@
  <data name="labelControl7.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
  </data>
-  <data name="labelControl7.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl7.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl7.Location" type="System.Drawing.Point, System.Drawing">
@@ -299,7 +299,7 @@
    <value>labelControl7</value>
  </data>
  <data name="&gt;&gt;labelControl7.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl7.Parent" xml:space="preserve">
    <value>$this</value>
@@ -353,7 +353,7 @@
    <value>btnOk</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
    <value>$this</value>
@@ -364,7 +364,7 @@
  <data name="labelControl2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Left, Right</value>
  </data>
-  <data name="labelControl2.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl2.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl2.Location" type="System.Drawing.Point, System.Drawing">
@@ -383,7 +383,7 @@
    <value>labelControl2</value>
  </data>
  <data name="&gt;&gt;labelControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl2.Parent" xml:space="preserve">
    <value>$this</value>
@@ -410,6 +410,6 @@
    <value>PresetProgramNrDialog</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/source/ChanSort.Loader.LG.UI/TvSettingsForm.resx
+++ b/source/ChanSort.Loader.LG.UI/TvSettingsForm.resx
@@ -139,7 +139,7 @@
    <value>cbHbbTv</value>
  </data>
  <data name="&gt;&gt;cbHbbTv.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbHbbTv.Parent" xml:space="preserve">
    <value>grpOption</value>
@@ -166,7 +166,7 @@
    <value>cbCustomCountry</value>
  </data>
  <data name="&gt;&gt;cbCustomCountry.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbCustomCountry.Parent" xml:space="preserve">
    <value>grpOption</value>
@@ -177,8 +177,8 @@
  <data name="comboBoxEdit1.Location" type="System.Drawing.Point, System.Drawing">
    <value>72, 29</value>
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="comboBoxEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="comboBoxEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="comboBoxEdit1.Size" type="System.Drawing.Size, System.Drawing">
@@ -191,7 +191,7 @@
    <value>comboBoxEdit1</value>
  </data>
  <data name="&gt;&gt;comboBoxEdit1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;comboBoxEdit1.Parent" xml:space="preserve">
    <value>grpOption</value>
@@ -215,7 +215,7 @@
    <value>labelControl1</value>
  </data>
  <data name="&gt;&gt;labelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl1.Parent" xml:space="preserve">
    <value>grpOption</value>
@@ -242,7 +242,7 @@
    <value>grpOption</value>
  </data>
  <data name="&gt;&gt;grpOption.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grpOption.Parent" xml:space="preserve">
    <value>$this</value>
@@ -269,7 +269,7 @@
    <value>btnOk</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
    <value>$this</value>
@@ -296,7 +296,7 @@
    <value>btnCancel</value>
  </data>
  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
    <value>$this</value>
@@ -304,8 +304,8 @@
  <data name="&gt;&gt;btnCancel.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="labelControl3.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="labelControl3.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl3.Location" type="System.Drawing.Point, System.Drawing">
@@ -324,7 +324,7 @@
    <value>labelControl3</value>
  </data>
  <data name="&gt;&gt;labelControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl3.Parent" xml:space="preserve">
    <value>grpHotelMode</value>
@@ -348,7 +348,7 @@
    <value>labelControl2</value>
  </data>
  <data name="&gt;&gt;labelControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl2.Parent" xml:space="preserve">
    <value>grpHotelMode</value>
@@ -375,7 +375,7 @@
    <value>cbDtvUpdate</value>
  </data>
  <data name="&gt;&gt;cbDtvUpdate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbDtvUpdate.Parent" xml:space="preserve">
    <value>grpHotelMode</value>
@@ -402,7 +402,7 @@
    <value>cbHotelMode</value>
  </data>
  <data name="&gt;&gt;cbHotelMode.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbHotelMode.Parent" xml:space="preserve">
    <value>grpHotelMode</value>
@@ -429,7 +429,7 @@
    <value>grpHotelMode</value>
  </data>
  <data name="&gt;&gt;grpHotelMode.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grpHotelMode.Parent" xml:space="preserve">
    <value>$this</value>
@@ -456,7 +456,7 @@
    <value>cbAutoChannelUpdate</value>
  </data>
  <data name="&gt;&gt;cbAutoChannelUpdate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbAutoChannelUpdate.Parent" xml:space="preserve">
    <value>grpSetup</value>
@@ -483,7 +483,7 @@
    <value>grpSetup</value>
  </data>
  <data name="&gt;&gt;grpSetup.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grpSetup.Parent" xml:space="preserve">
    <value>$this</value>
@@ -491,7 +491,7 @@
  <data name="&gt;&gt;grpSetup.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
-  <data name="labelControl4.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl4.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl4.Location" type="System.Drawing.Point, System.Drawing">
@@ -510,7 +510,7 @@
    <value>labelControl4</value>
  </data>
  <data name="&gt;&gt;labelControl4.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl4.Parent" xml:space="preserve">
    <value>grpInformation</value>
@@ -537,7 +537,7 @@
    <value>grpInformation</value>
  </data>
  <data name="&gt;&gt;grpInformation.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grpInformation.Parent" xml:space="preserve">
    <value>$this</value>
@@ -567,7 +567,7 @@
    <value>lblHotelMenuAutoDetect</value>
  </data>
  <data name="&gt;&gt;lblHotelMenuAutoDetect.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblHotelMenuAutoDetect.Parent" xml:space="preserve">
    <value>$this</value>
@@ -594,6 +594,6 @@
    <value>TvSettingsForm</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/source/ChanSort.Loader.Philips/XmlSerializer.cs
+++ b/source/ChanSort.Loader.Philips/XmlSerializer.cs
@@ -562,7 +562,8 @@ namespace ChanSort.Loader.Philips
      {
        if (part == "")
          continue;
-        buffer.WriteByte((byte)ParseInt(part));
+        var val = (byte)ParseInt(part);
+        buffer.WriteByte(val);
      }

      return Encoding.Unicode.GetString(buffer.GetBuffer(), 0, (int) buffer.Length).TrimEnd('\x0');
--- a/source/ChanSort.sln
+++ b/source/ChanSort.sln
@@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Android", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Loewe", "ChanSort.Loader.Loewe\ChanSort.Loader.Loewe.csproj", "{D4B9399D-5609-4F87-A4BA-5B35983A981B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.CmdbBin", "Test.Loader.CmdbBin\Test.Loader.CmdbBin.csproj", "{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		All_Debug|Any CPU = All_Debug|Any CPU
@@ -1163,6 +1165,36 @@ Global
 		{D4B9399D-5609-4F87-A4BA-5B35983A981B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D4B9399D-5609-4F87-A4BA-5B35983A981B}.Release|x86.ActiveCfg = Release|Any CPU
 		{D4B9399D-5609-4F87-A4BA-5B35983A981B}.Release|x86.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Debug|x86.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|Any CPU.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|x86.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.All_Release|x86.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.NoDevExpress_Debug|x86.Build.0 = Debug|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/source/ChanSort/AboutForm.resx
+++ b/source/ChanSort/AboutForm.resx
@@ -117,8 +117,8 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="lblWebsite.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="lblWebsite.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -139,7 +139,7 @@
    <value>lblWebsite</value>
  </data>
  <data name="&gt;&gt;lblWebsite.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblWebsite.Parent" xml:space="preserve">
    <value>$this</value>
@@ -168,7 +168,7 @@
    <value>lnkDownload</value>
  </data>
  <data name="&gt;&gt;lnkDownload.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lnkDownload.Parent" xml:space="preserve">
    <value>$this</value>
@@ -192,7 +192,7 @@
    <value>gcPlugins</value>
  </data>
  <data name="&gt;&gt;gcPlugins.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="lnkEmail.EditValue" xml:space="preserve">
    <value>horst@beham.biz</value>
@@ -211,7 +211,7 @@
    <value>lnkEmail</value>
  </data>
  <data name="&gt;&gt;lnkEmail.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lnkEmail.Parent" xml:space="preserve">
    <value>$this</value>
@@ -219,7 +219,7 @@
  <data name="&gt;&gt;lnkEmail.ZOrder" xml:space="preserve">
    <value>7</value>
  </data>
-  <data name="lblAuthor.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="lblAuthor.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="lblAuthor.Location" type="System.Drawing.Point, System.Drawing">
@@ -238,7 +238,7 @@
    <value>lblAuthor</value>
  </data>
  <data name="&gt;&gt;lblAuthor.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblAuthor.Parent" xml:space="preserve">
    <value>$this</value>
@@ -246,7 +246,7 @@
  <data name="&gt;&gt;lblAuthor.ZOrder" xml:space="preserve">
    <value>6</value>
  </data>
-  <data name="lblLicense.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="lblLicense.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="lblLicense.Location" type="System.Drawing.Point, System.Drawing">
@@ -265,7 +265,7 @@
    <value>lblLicense</value>
  </data>
  <data name="&gt;&gt;lblLicense.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblLicense.Parent" xml:space="preserve">
    <value>$this</value>
@@ -293,7 +293,7 @@
    <value>lnkLicense</value>
  </data>
  <data name="&gt;&gt;lnkLicense.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.HyperLinkEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lnkLicense.Parent" xml:space="preserve">
    <value>$this</value>
@@ -301,7 +301,7 @@
  <data name="&gt;&gt;lnkLicense.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
-  <data name="lblCredits.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="lblCredits.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="lblCredits.Location" type="System.Drawing.Point, System.Drawing">
@@ -320,7 +320,7 @@
    <value>lblCredits</value>
  </data>
  <data name="&gt;&gt;lblCredits.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblCredits.Parent" xml:space="preserve">
    <value>$this</value>
@@ -344,7 +344,7 @@
    <value>txtCredits</value>
  </data>
  <data name="&gt;&gt;txtCredits.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;txtCredits.Parent" xml:space="preserve">
    <value>$this</value>
@@ -371,7 +371,7 @@
    <value>btnClose</value>
  </data>
  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
    <value>$this</value>
@@ -396,7 +396,7 @@
    <value>txtAuthor</value>
  </data>
  <data name="&gt;&gt;txtAuthor.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;txtAuthor.Parent" xml:space="preserve">
    <value>$this</value>
@@ -423,30 +423,30 @@
    <value>gvPlugins</value>
  </data>
  <data name="&gt;&gt;gvPlugins.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colPlugin.Name" xml:space="preserve">
    <value>colPlugin</value>
  </data>
  <data name="&gt;&gt;colPlugin.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colDisplayText.Name" xml:space="preserve">
    <value>colDisplayText</value>
  </data>
  <data name="&gt;&gt;colDisplayText.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colFileTypes.Name" xml:space="preserve">
    <value>colFileTypes</value>
  </data>
  <data name="&gt;&gt;colFileTypes.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>AboutForm</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/source/ChanSort/ActionBox.resx
+++ b/source/ChanSort/ActionBox.resx
@@ -125,8 +125,8 @@
  <data name="lblMessage.Appearance.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 9pt</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="lblMessage.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="lblMessage.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="lblMessage.Location" type="System.Drawing.Point, System.Drawing">
@@ -146,7 +146,7 @@
    <value>lblMessage</value>
  </data>
  <data name="&gt;&gt;lblMessage.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblMessage.Parent" xml:space="preserve">
    <value>$this</value>
@@ -160,8 +160,8 @@
  <data name="imageCollection1.ImageSize" type="System.Drawing.Size, System.Drawing">
    <value>32, 32</value>
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="imageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="imageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4xLCBWZXJzaW9uPTIxLjEu
        NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
@@ -455,12 +455,12 @@
    <value>imageCollection1</value>
  </data>
  <data name="&gt;&gt;imageCollection1.Type" xml:space="preserve">
-    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.Utils.ImageCollection, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>ActionBoxDialog</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/source/ChanSort/ActionImages.resx
+++ b/source/ChanSort/ActionImages.resx
@@ -120,8 +120,8 @@
  <metadata name="imageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>349, 503</value>
  </metadata>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="imageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="imageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
        NS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE
--- a/source/ChanSort/ChanSort.csproj
+++ b/source/ChanSort/ChanSort.csproj
@@ -69,47 +69,50 @@
    <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Drawing.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Office.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Pdf.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Data.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.RichEdit.v21.2.Export, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Office.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Pdf.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v22.1.Export, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.RichEdit.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Printing.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.RichEdit.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Data.Desktop.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Utils.v21.2.UI, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.Utils.v22.1.UI, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+    <Reference Include="DevExpress.XtraPrinting.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
    </Reference>
-    <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v21.2.Wizard, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraCharts.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.PivotGrid.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.CodeParser.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DevExpress.XtraReports.v21.2.Extensions, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="DevExpress.Charts.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v22.1.Wizard, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.PivotGrid.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Sparkline.v22.1.Core, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.CodeParser.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraReports.v22.1.Extensions, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="System" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.configuration" />
--- a/source/ChanSort/CharsetForm.resx
+++ b/source/ChanSort/CharsetForm.resx
@@ -138,13 +138,13 @@
    <value>btnCancel</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="gcCharset.Size" type="System.Drawing.Size, System.Drawing">
    <value>433, 446</value>
  </data>
  <data name="&gt;&gt;gvCharset.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>CharsetForm</value>
@@ -178,12 +178,12 @@
  <data name="&gt;&gt;btnMyCountry.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gcCharset.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gcCharset.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v22.1">
    <value>Center</value>
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gcCharset.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gcCharset.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v22.1">
    <value>None</value>
  </data>
  <data name="&gt;&gt;gvCharset.Name" xml:space="preserve">
@@ -196,7 +196,7 @@
    <value>Top, Right</value>
  </data>
  <data name="&gt;&gt;btnMyCountry.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="gcCharset.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -211,10 +211,10 @@
    <value>$this</value>
  </data>
  <data name="&gt;&gt;gcCharset.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colName.Name" xml:space="preserve">
    <value>colName</value>
@@ -256,7 +256,7 @@
    <value>gcCharset</value>
  </data>
  <data name="&gt;&gt;colCodePage.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="btnMyCountry.Text" xml:space="preserve">
    <value>Default character set for my country</value>
@@ -271,7 +271,7 @@
    <value>353, 6</value>
  </data>
  <data name="&gt;&gt;colName.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 23</value>
@@ -331,7 +331,7 @@
    <value>btnOk</value>
  </data>
  <data name="&gt;&gt;colDisplayName.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>433, 483</value>
@@ -340,17 +340,17 @@
    <value>142</value>
  </data>
  <data name="&gt;&gt;panelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="colName.Visible" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gcCharset.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+  <assembly alias="DevExpress.Data.v22.1" name="DevExpress.Data.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gcCharset.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
--- a/source/ChanSort/GlobalImageCollection.resx
+++ b/source/ChanSort/GlobalImageCollection.resx
@@ -120,8 +120,8 @@
  <metadata name="rawImageCollection.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="rawImageCollection.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="rawImageCollection.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4xLCBWZXJzaW9uPTIxLjEu
        NS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
--- a/source/ChanSort/MainForm.de.resx
+++ b/source/ChanSort/MainForm.de.resx
@@ -124,8 +124,8 @@
  <data name="gridLeft.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gridLeft.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+  <assembly alias="DevExpress.Data.v22.1" name="DevExpress.Data.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLeft.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="gridLeft.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -144,15 +144,15 @@
  <data name="gridLeft.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
    <value>0, 0</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gridLeft.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLeft.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v22.1">
    <value>Center</value>
  </data>
  <data name="gridLeft.EmbeddedNavigator.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="gridLeft.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLeft.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v22.1">
    <value>None</value>
  </data>
  <data name="gridLeft.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
@@ -1059,8 +1059,8 @@
  <data name="bar1.Text" xml:space="preserve">
    <value>Werkzeuge</value>
  </data>
-  <assembly alias="DevExpress.XtraBars.v21.2" name="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="barManager1.Categories" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.XtraBars.v22.1" name="DevExpress.XtraBars.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="barManager1.Categories" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYyMS4xLCBWZXJzaW9uPTIx
        LjEuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -1070,7 +1070,7 @@
        Xxl+0wEL
 </value>
  </data>
-  <data name="barManager1.Categories1" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories1" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYyMS4xLCBWZXJzaW9uPTIx
        LjEuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -1080,7 +1080,7 @@
        KphCYAEL
 </value>
  </data>
-  <data name="barManager1.Categories2" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories2" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYyMS4xLCBWZXJzaW9uPTIx
        LjEuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -1090,7 +1090,7 @@
        ZMgcwAEL
 </value>
  </data>
-  <data name="barManager1.Categories3" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories3" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYyMS4xLCBWZXJzaW9uPTIx
        LjEuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -1100,7 +1100,7 @@
        WIeWYGkVXQEL
 </value>
  </data>
-  <data name="barManager1.Categories4" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories4" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYyMS4xLCBWZXJzaW9uPTIx
        LjEuNS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -1122,7 +1122,7 @@
  <data name="rbInsertSwap.Properties.DisplayValueUnchecked" xml:space="preserve">
    <value />
  </data>
-  <data name="rbInsertSwap.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v21.2">
+  <data name="rbInsertSwap.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="rbInsertSwap.Size" type="System.Drawing.Size, System.Drawing">
@@ -1140,7 +1140,7 @@
  <data name="rbInsertAfter.Properties.DisplayValueUnchecked" xml:space="preserve">
    <value />
  </data>
-  <data name="rbInsertAfter.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v21.2">
+  <data name="rbInsertAfter.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="rbInsertAfter.Size" type="System.Drawing.Size, System.Drawing">
@@ -1158,7 +1158,7 @@
  <data name="rbInsertBefore.Properties.DisplayValueUnchecked" xml:space="preserve">
    <value />
  </data>
-  <data name="rbInsertBefore.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v21.2">
+  <data name="rbInsertBefore.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="rbInsertBefore.Size" type="System.Drawing.Size, System.Drawing">
@@ -1176,7 +1176,7 @@
  <data name="cbCloseGap.Properties.DisplayValueUnchecked" xml:space="preserve">
    <value />
  </data>
-  <data name="cbCloseGap.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v21.2">
+  <data name="cbCloseGap.Properties.GlyphVerticalAlignment" type="DevExpress.Utils.VertAlignment, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="cbCloseGap.ToolTip" xml:space="preserve">
@@ -1269,7 +1269,7 @@
  <data name="gridRight.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
-  <data name="gridRight.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+  <data name="gridRight.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v22.1">
    <value>Default</value>
  </data>
  <data name="gridRight.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -1287,13 +1287,13 @@
  <data name="gridRight.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
    <value>0, 0</value>
  </data>
-  <data name="gridRight.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+  <data name="gridRight.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v22.1">
    <value>Center</value>
  </data>
  <data name="gridRight.EmbeddedNavigator.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="gridRight.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+  <data name="gridRight.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v22.1">
    <value>None</value>
  </data>
  <data name="gridRight.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
--- a/source/ChanSort/MainForm.pt.resx
+++ b/source/ChanSort/MainForm.pt.resx
@@ -62,9 +62,9 @@
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <assembly alias="DevExpress.Data.v22.1" name="DevExpress.Data.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="colOutSlot.Caption" xml:space="preserve">
    <value>Novo\nPos</value>
  </data>
@@ -326,8 +326,8 @@
  <data name="colOutServiceType.Caption" xml:space="preserve">
    <value>Tipo\nserviço</value>
  </data>
-  <assembly alias="DevExpress.XtraBars.v21.2" name="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="barManager1.Categories" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.XtraBars.v22.1" name="DevExpress.XtraBars.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="barManager1.Categories" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy
        LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -337,7 +337,7 @@
        Xxl+0wEL
 </value>
  </data>
-  <data name="barManager1.Categories1" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories1" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy
        LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -347,7 +347,7 @@
        KphCYAEL
 </value>
  </data>
-  <data name="barManager1.Categories2" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories2" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy
        LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
@@ -357,7 +357,7 @@
        ZMgcwAEL
 </value>
  </data>
-  <data name="barManager1.Categories3" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="barManager1.Categories3" type="DevExpress.XtraBars.BarManagerCategory, DevExpress.XtraBars.v22.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxMi4yLCBWZXJzaW9uPTEy
        LjIuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA
--- a/source/ChanSort/MainForm.resx
+++ b/source/ChanSort/MainForm.resx
--- a/source/ChanSort/MainForm.ru.resx
+++ b/source/ChanSort/MainForm.ru.resx
@@ -148,7 +148,7 @@
    <value>до</value>
  </data>
  <data name="cbCloseGap.Properties.Caption" xml:space="preserve">
-    <value>Закрывать разрыв при перемещении/удалении канала</value>
+    <value>Убирать разрыв при перемещении/удалении канала</value>
  </data>
  <data name="cbCloseGap.ToolTip" xml:space="preserve">
    <value>Если включено, все каналы после текущего будут автоматически перенумерованы</value>
@@ -160,7 +160,7 @@
    <value>Нет списков каналов</value>
  </data>
  <data name="lblSetProgramNr.Text" xml:space="preserve">
-    <value>Установить:</value>
+    <value>Позиция:</value>
  </data>
  <data name="lblSetProgramNr.ToolTip" xml:space="preserve">
    <value>Номер программы для добавления и установки</value>
@@ -328,7 +328,7 @@
    <value>после</value>
  </data>
  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
-    <value>обменять</value>
+    <value>обмен</value>
  </data>
  <data name="miShowWarningsAfterLoad.Caption" xml:space="preserve">
    <value>Показывать предупреждения после загрузки файла</value>
@@ -349,7 +349,7 @@
    <value>Перенастроить каналы и удалить дубликаты</value>
  </data>
  <data name="miCleanupChannels.Caption" xml:space="preserve">
-    <value>Очистка данных канала</value>
+    <value>Очистка данных о каналах</value>
  </data>
  <data name="miTvSettings.Caption" xml:space="preserve">
    <value>Настройка устройства...</value>
@@ -376,10 +376,10 @@
    <value>Заблокировать канал</value>
  </data>
  <data name="mnuFavUnset.Caption" xml:space="preserve">
-    <value>Удалить из Избранного</value>
+    <value>Удалить из избранного</value>
  </data>
  <data name="mnuFavSet.Caption" xml:space="preserve">
-    <value>Добавить в Избранное</value>
+    <value>Добавить в избранное</value>
  </data>
  <data name="miRenum.Caption" xml:space="preserve">
    <value>Изменить нумерацию каналов</value>
@@ -430,7 +430,7 @@
    <value>Перезагрузить</value>
  </data>
  <data name="miOpen.Caption" xml:space="preserve">
-    <value>Открыть файл данных ТВ...</value>
+    <value>Открыть файл с ТВ-данными…</value>
  </data>
  <data name="miFile.Caption" xml:space="preserve">
    <value>Файл</value>
@@ -501,36 +501,6 @@
  <data name="mnuLanguage.Caption" xml:space="preserve">
    <value>Язык</value>
  </data>
-  <data name="miEnglish.Caption" xml:space="preserve">
-    <value>Английский</value>
-  </data>
-  <data name="miCzech.Caption" xml:space="preserve">
-    <value>Чешский</value>
-  </data>
-  <data name="miGerman.Caption" xml:space="preserve">
-    <value>Немецкий</value>
-  </data>
-  <data name="miSpanish.Caption" xml:space="preserve">
-    <value>Испанский</value>
-  </data>
-  <data name="miHungarian.Caption" xml:space="preserve">
-    <value>Венгерский</value>
-  </data>
-  <data name="miPolski.Caption" xml:space="preserve">
-    <value>Польский</value>
-  </data>
-  <data name="miPortuguese.Caption" xml:space="preserve">
-    <value>Португальский</value>
-  </data>
-  <data name="miRomanian.Caption" xml:space="preserve">
-    <value>Румынский</value>
-  </data>
-  <data name="miRussian.Caption" xml:space="preserve">
-    <value>Русский</value>
-  </data>
-  <data name="miTurkish.Caption" xml:space="preserve">
-    <value>Турецкий</value>
-  </data>
  <data name="miUtf8Charset.Caption" xml:space="preserve">
    <value>UTF-8 (Юникод)</value>
  </data>
@@ -565,7 +535,7 @@
    <value>Интеграция с Проводником Windows</value>
  </data>
  <data name="miCheckUpdates.Caption" xml:space="preserve">
-    <value>Проверка обновлений</value>
+    <value>Проверять обновления</value>
  </data>
  <data name="miResetAndRestart.Caption" xml:space="preserve">
    <value>Сбросить в стандартные настройки и перезапустить</value>
@@ -574,7 +544,7 @@
    <value>Сбросить все изменённые настройки и перезапустить программу</value>
  </data>
  <data name="mnuAccessibility.Caption" xml:space="preserve">
-    <value>Доступность</value>
+    <value>Разное</value>
  </data>
  <data name="mnuGotoChannelList.AccessibleDescription" xml:space="preserve">
    <value>Открыть подменю выбора источника входного сигнала. Это меню можно вызвать сразу клавишей F1</value>
@@ -615,38 +585,23 @@
  <data name="miGotoRightList.Caption" xml:space="preserve">
    <value>Список справа</value>
  </data>
-  <data name="miFontSmall.Caption" xml:space="preserve">
-    <value>S - Tahoma 8пт</value>
-  </data>
-  <data name="miFontMedium.Caption" xml:space="preserve">
-    <value>M - Segoe UI 9пт</value>
-  </data>
-  <data name="miFontLarge.Caption" xml:space="preserve">
-    <value>L - Segoe UI 10пт</value>
-  </data>
-  <data name="miFontXLarge.Caption" xml:space="preserve">
-    <value>XL - Segoe UI 11пт</value>
-  </data>
-  <data name="miFontXxLarge.Caption" xml:space="preserve">
-    <value>XXL - Segoe UI 12пт</value>
-  </data>
  <data name="btnSearchLeft.ToolTip" xml:space="preserve">
    <value>Поиск канала по имени</value>
  </data>
  <data name="btnToggleFavH.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное H</value>
+    <value>Вкл./выкл. избранное H</value>
  </data>
  <data name="btnToggleFavH.Text" xml:space="preserve">
    <value>±H</value>
  </data>
  <data name="btnToggleFavG.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное G</value>
+    <value>Вкл./выкл. избранное G</value>
  </data>
  <data name="btnToggleFavG.Text" xml:space="preserve">
    <value>±G</value>
  </data>
  <data name="btnToggleFavF.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное F</value>
+    <value>Вкл./выкл. избранное F</value>
  </data>
  <data name="btnToggleFavF.Text" xml:space="preserve">
    <value>±F</value>
@@ -655,31 +610,31 @@
    <value>Вкл./выкл. родительский контроль</value>
  </data>
  <data name="btnToggleFavE.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное E</value>
+    <value>Вкл./выкл. избранное E</value>
  </data>
  <data name="btnToggleFavE.Text" xml:space="preserve">
    <value>±E</value>
  </data>
  <data name="btnToggleFavD.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное D</value>
+    <value>Вкл./выкл. избранное D</value>
  </data>
  <data name="btnToggleFavD.Text" xml:space="preserve">
    <value>±D</value>
  </data>
  <data name="btnToggleFavC.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное C</value>
+    <value>Вкл./выкл. избранное C</value>
  </data>
  <data name="btnToggleFavC.Text" xml:space="preserve">
    <value>±C</value>
  </data>
  <data name="btnToggleFavB.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное B</value>
+    <value>Вкл./выкл. избранное B</value>
  </data>
  <data name="btnToggleFavB.Text" xml:space="preserve">
    <value>±B</value>
  </data>
  <data name="btnToggleFavA.AccessibleDescription" xml:space="preserve">
-    <value>Вкл./выкл. Избранное A</value>
+    <value>Вкл./выкл. избранное A</value>
  </data>
  <data name="btnToggleFavA.Text" xml:space="preserve">
    <value>±A</value>
--- a/source/ChanSort/Printing/ReportOptionsDialog.resx
+++ b/source/ChanSort/Printing/ReportOptionsDialog.resx
@@ -135,7 +135,7 @@
    <value>labelControl1</value>
  </data>
  <data name="&gt;&gt;labelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -162,7 +162,7 @@
    <value>rbSortByNumber</value>
  </data>
  <data name="&gt;&gt;rbSortByNumber.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;rbSortByNumber.Parent" xml:space="preserve">
    <value>$this</value>
@@ -186,7 +186,7 @@
    <value>rbSortByName</value>
  </data>
  <data name="&gt;&gt;rbSortByName.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;rbSortByName.Parent" xml:space="preserve">
    <value>$this</value>
@@ -210,7 +210,7 @@
    <value>labelControl2</value>
  </data>
  <data name="&gt;&gt;labelControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl2.Parent" xml:space="preserve">
    <value>$this</value>
@@ -229,8 +229,8 @@
  <data name="fontEdit1.Location" type="System.Drawing.Point, System.Drawing">
    <value>106, 52</value>
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="fontEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="fontEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="fontEdit1.Size" type="System.Drawing.Size, System.Drawing">
@@ -243,7 +243,7 @@
    <value>fontEdit1</value>
  </data>
  <data name="&gt;&gt;fontEdit1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.FontEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.FontEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;fontEdit1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -270,7 +270,7 @@
    <value>btnPreview</value>
  </data>
  <data name="&gt;&gt;btnPreview.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnPreview.Parent" xml:space="preserve">
    <value>$this</value>
@@ -297,7 +297,7 @@
    <value>btnCancel</value>
  </data>
  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnCancel.Parent" xml:space="preserve">
    <value>$this</value>
@@ -314,7 +314,7 @@
  <data name="spinFontSize.Location" type="System.Drawing.Point, System.Drawing">
    <value>266, 52</value>
  </data>
-  <data name="spinFontSize.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <data name="spinFontSize.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="spinFontSize.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
@@ -330,7 +330,7 @@
    <value>spinFontSize</value>
  </data>
  <data name="&gt;&gt;spinFontSize.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;spinFontSize.Parent" xml:space="preserve">
    <value>$this</value>
@@ -347,7 +347,7 @@
  <data name="spinColumnCount.Location" type="System.Drawing.Point, System.Drawing">
    <value>104, 78</value>
  </data>
-  <data name="spinEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <data name="spinEdit1.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="spinEdit1.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
@@ -363,7 +363,7 @@
    <value>spinColumnCount</value>
  </data>
  <data name="&gt;&gt;spinColumnCount.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;spinColumnCount.Parent" xml:space="preserve">
    <value>$this</value>
@@ -387,7 +387,7 @@
    <value>labelControl3</value>
  </data>
  <data name="&gt;&gt;labelControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl3.Parent" xml:space="preserve">
    <value>$this</value>
@@ -414,6 +414,6 @@
    <value>ReportOptionsDialog</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/source/ChanSort/Printing/ReportOptionsDialog.ru.resx
+++ b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx
@@ -133,7 +133,7 @@
    <value>Шрифт:</value>
  </data>
  <data name="btnPreview.Text" xml:space="preserve">
-    <value>Предпросмотр…</value>
+    <value>Просмотр…</value>
  </data>
  <data name="labelControl3.Text" xml:space="preserve">
    <value>Колонки:</value>
--- a/source/ChanSort/Program.cs
+++ b/source/ChanSort/Program.cs
@@ -31,7 +31,7 @@ namespace ChanSort.Ui
      WindowsFormsSettings.EnableFormSkins();
      //WindowsFormsSettings.ForcePaintApiDiagnostics(PaintApiDiagnosticsLevel.Default);
      BarAndDockingController.Default.PropertiesBar.ScaleIcons = false;
-      //WindowsFormsSettings.DefaultFont = new Font("Tahoma", 8.25f);
+      //WindowsFormsSettings.DefaultFont = new System.Drawing.Font("Tahoma", 8.25f);
      //DevExpress.Skins.SkinManager.EnableFormSkins();

      Application.EnableVisualStyles();
--- a/source/ChanSort/Properties/Resources.Designer.cs
+++ b/source/ChanSort/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace ChanSort.Ui.Properties {
    // class via a tool like ResGen or Visual Studio.
    // To add or remove a member, edit your .ResX file then rerun ResGen
    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
--- a/source/ChanSort/Properties/Resources.ru.resx
+++ b/source/ChanSort/Properties/Resources.ru.resx
@@ -129,7 +129,7 @@
    <value>Поддерживаемые файлы|{0}|Все файлы (*.*)|*</value>
  </data>
  <data name="MainForm_FileDialog_SaveFileFilter" xml:space="preserve">
-    <value>{0}-файлы|*{0}|Все файлы (*.*)|*</value>
+    <value>Файлы {0}|*{0}|Все файлы (*.*)|*</value>
  </data>
  <data name="MainForm_TryExecute_Exception" xml:space="preserve">
    <value>Неизвестная ошибка:
@@ -219,13 +219,13 @@
    <value>Как вы хотите отредактировать список каналов?</value>
  </data>
  <data name="MainForm_InitInitialChannelOrder_EmptyList" xml:space="preserve">
-    <value>Создать новый список: Начать с пустого списка и добавить каналы в нужном порядке</value>
+    <value>Создать новый список - начать с пустого списка и добавить каналы в нужном порядке</value>
  </data>
  <data name="MainForm_InitInitialChannelOrder_CurrentList" xml:space="preserve">
-    <value>Изменить текущий список: Начать с текущего списка и изменить его</value>
+    <value>Изменить текущий список - начать с текущего списка и изменить его</value>
  </data>
  <data name="MainForm_InitInitialChannelOrder_ReferenceList" xml:space="preserve">
-    <value>Скопировать список каналов: Упорядочить каналы, как в справочном списке</value>
+    <value>Скопировать список каналов - упорядочить каналы, как в базовом списке</value>
  </data>
  <data name="MainForm_PromptHandlingOfUnsortedChannels_Question" xml:space="preserve">
    <value>Как поступить с неотсортированными каналами?</value>
--- a/source/ChanSort/Properties/licenses.licx
+++ b/source/ChanSort/Properties/licenses.licx
@@ -1,6 +0,0 @@
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/source/ChanSort/ReferenceListForm.es.resx
+++ b/source/ChanSort/ReferenceListForm.es.resx
@@ -214,4 +214,28 @@ Este paso puede ser repetido tanto como se necesite</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Aplicar lista de referencia</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.hu.resx
+++ b/source/ChanSort/ReferenceListForm.hu.resx
@@ -215,4 +215,28 @@ Ez a lépés szükség szerint megismételhető.</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Referencia lista alkalmazása</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.pl.resx
+++ b/source/ChanSort/ReferenceListForm.pl.resx
@@ -215,4 +215,28 @@ lub plik danych z innego telewizora (SCM, TLL, DB, BIN, ...)</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Zastosuj listę referencyjną</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.resx
+++ b/source/ChanSort/ReferenceListForm.resx
@@ -135,7 +135,7 @@
    <value>labelControl1</value>
  </data>
  <data name="&gt;&gt;labelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl1.Parent" xml:space="preserve">
    <value>groupControl1</value>
@@ -153,12 +153,13 @@
  <data name="edFile.Location" type="System.Drawing.Point, System.Drawing">
    <value>132, 36</value>
  </data>
-  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edFile.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <assembly alias="DevExpress.Utils.v22.1" name="DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edFile.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Ellipsis</value>
  </data>
  <data name="edFile.Properties.Buttons1" xml:space="preserve">
    <value />
+    <comment>@Invariant</comment>
  </data>
  <data name="edFile.Properties.Buttons2" type="System.Int32, mscorlib">
    <value>-1</value>
@@ -181,7 +182,7 @@
  <data name="edFile.Properties.Buttons8" type="System.Resources.ResXNullRef, System.Windows.Forms">
    <value />
  </data>
-  <data name="edFile.Properties.Buttons9" type="DevExpress.Utils.ToolTipAnchor, DevExpress.Utils.v21.2">
+  <data name="edFile.Properties.Buttons9" type="DevExpress.Utils.ToolTipAnchor, DevExpress.Utils.v22.1">
    <value>Default</value>
  </data>
  <data name="edFile.Size" type="System.Drawing.Size, System.Drawing">
@@ -194,7 +195,7 @@
    <value>edFile</value>
  </data>
  <data name="&gt;&gt;edFile.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;edFile.Parent" xml:space="preserve">
    <value>groupControl1</value>
@@ -202,8 +203,8 @@
  <data name="&gt;&gt;edFile.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
-  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="labelControl2.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <assembly alias="DevExpress.XtraEditors.v22.1" name="DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="labelControl2.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl2.Location" type="System.Drawing.Point, System.Drawing">
@@ -224,7 +225,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl2</value>
  </data>
  <data name="&gt;&gt;labelControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl2.Parent" xml:space="preserve">
    <value>groupControl1</value>
@@ -251,7 +252,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>rbAuto</value>
  </data>
  <data name="&gt;&gt;rbAuto.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;rbAuto.Parent" xml:space="preserve">
    <value>groupControl2</value>
@@ -278,7 +279,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>rbManual</value>
  </data>
  <data name="&gt;&gt;rbManual.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;rbManual.Parent" xml:space="preserve">
    <value>groupControl2</value>
@@ -302,7 +303,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl3</value>
  </data>
  <data name="&gt;&gt;labelControl3.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl3.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -313,7 +314,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  <data name="comboSource.Location" type="System.Drawing.Point, System.Drawing">
    <value>123, 33</value>
  </data>
-  <data name="comboSource.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <data name="comboSource.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="comboSource.Size" type="System.Drawing.Size, System.Drawing">
@@ -326,7 +327,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>comboSource</value>
  </data>
  <data name="&gt;&gt;comboSource.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;comboSource.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -337,7 +338,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  <data name="comboTarget.Location" type="System.Drawing.Point, System.Drawing">
    <value>123, 7</value>
  </data>
-  <data name="comboTarget.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <data name="comboTarget.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="comboTarget.Size" type="System.Drawing.Size, System.Drawing">
@@ -350,7 +351,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>comboTarget</value>
  </data>
  <data name="&gt;&gt;comboTarget.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;comboTarget.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -374,7 +375,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl4</value>
  </data>
  <data name="&gt;&gt;labelControl4.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl4.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -398,7 +399,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbTv</value>
  </data>
  <data name="&gt;&gt;cbTv.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbTv.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -422,7 +423,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbRadio</value>
  </data>
  <data name="&gt;&gt;cbRadio.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbRadio.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -446,7 +447,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl5</value>
  </data>
  <data name="&gt;&gt;labelControl5.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl5.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -454,7 +455,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  <data name="&gt;&gt;labelControl5.ZOrder" xml:space="preserve">
    <value>20</value>
  </data>
-  <data name="labelControl6.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl6.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl6.Location" type="System.Drawing.Point, System.Drawing">
@@ -473,7 +474,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl6</value>
  </data>
  <data name="&gt;&gt;labelControl6.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl6.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -483,33 +484,41 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  </data>
  <data name="comboPrNr.EditValue" xml:space="preserve">
    <value>1</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Location" type="System.Drawing.Point, System.Drawing">
    <value>123, 134</value>
  </data>
-  <data name="comboPrNr.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
+  <data name="comboPrNr.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v22.1">
    <value>Combo</value>
  </data>
  <data name="comboPrNr.Properties.Items" xml:space="preserve">
    <value>1</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
    <value>100</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
    <value>500</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
    <value>1000</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
    <value>2000</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
    <value>5000</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
    <value>7000</value>
+    <comment>@Invariant</comment>
  </data>
  <data name="comboPrNr.Size" type="System.Drawing.Size, System.Drawing">
    <value>140, 20</value>
@@ -521,7 +530,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>comboPrNr</value>
  </data>
  <data name="&gt;&gt;comboPrNr.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;comboPrNr.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -548,7 +557,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbData</value>
  </data>
  <data name="&gt;&gt;cbData.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbData.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -572,7 +581,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbConsecutive</value>
  </data>
  <data name="&gt;&gt;cbConsecutive.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbConsecutive.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -596,7 +605,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbIp</value>
  </data>
  <data name="&gt;&gt;cbIp.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbIp.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -620,7 +629,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbSat</value>
  </data>
  <data name="&gt;&gt;cbSat.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbSat.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -644,7 +653,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl11</value>
  </data>
  <data name="&gt;&gt;labelControl11.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl11.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -668,7 +677,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbAntenna</value>
  </data>
  <data name="&gt;&gt;cbAntenna.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbAntenna.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -692,7 +701,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbCable</value>
  </data>
  <data name="&gt;&gt;cbCable.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbCable.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -716,7 +725,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl9</value>
  </data>
  <data name="&gt;&gt;labelControl9.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl9.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -740,7 +749,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbAnalog</value>
  </data>
  <data name="&gt;&gt;cbAnalog.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbAnalog.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -764,7 +773,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>cbDigital</value>
  </data>
  <data name="&gt;&gt;cbDigital.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;cbDigital.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -783,12 +792,13 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  </data>
  <data name="lblTargetInfo.Text" xml:space="preserve">
    <value> </value>
+    <comment>@Invariant</comment>
  </data>
  <data name="&gt;&gt;lblTargetInfo.Name" xml:space="preserve">
    <value>lblTargetInfo</value>
  </data>
  <data name="&gt;&gt;lblTargetInfo.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblTargetInfo.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -807,12 +817,13 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  </data>
  <data name="lblSourceInfo.Text" xml:space="preserve">
    <value> </value>
+    <comment>@Invariant</comment>
  </data>
  <data name="&gt;&gt;lblSourceInfo.Name" xml:space="preserve">
    <value>lblSourceInfo</value>
  </data>
  <data name="&gt;&gt;lblSourceInfo.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;lblSourceInfo.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -836,7 +847,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>labelControl7</value>
  </data>
  <data name="&gt;&gt;labelControl7.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl7.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -863,7 +874,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>btnApply</value>
  </data>
  <data name="&gt;&gt;btnApply.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnApply.Parent" xml:space="preserve">
    <value>grpManual</value>
@@ -890,7 +901,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>grpManual</value>
  </data>
  <data name="&gt;&gt;grpManual.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;grpManual.Parent" xml:space="preserve">
    <value>groupControl2</value>
@@ -902,7 +913,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>Bottom, Right</value>
  </data>
  <data name="btnOk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>525, 662</value>
+    <value>525, 612</value>
  </data>
  <data name="btnOk.Size" type="System.Drawing.Size, System.Drawing">
    <value>88, 23</value>
@@ -917,7 +928,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>btnOk</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnOk.Parent" xml:space="preserve">
    <value>$this</value>
@@ -929,7 +940,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>Bottom, Right</value>
  </data>
  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>620, 662</value>
+    <value>620, 612</value>
  </data>
  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
    <value>88, 23</value>
@@ -944,7 +955,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>btnClose</value>
  </data>
  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
    <value>$this</value>
@@ -971,7 +982,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>linkWiki</value>
  </data>
  <data name="&gt;&gt;linkWiki.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.HyperlinkLabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.HyperlinkLabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;linkWiki.Parent" xml:space="preserve">
    <value>groupControl1</value>
@@ -980,7 +991,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>0</value>
  </data>
  <data name="groupControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
+    <value>12, 0</value>
  </data>
  <data name="groupControl1.Size" type="System.Drawing.Size, System.Drawing">
    <value>696, 142</value>
@@ -995,7 +1006,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
    <value>groupControl1</value>
  </data>
  <data name="&gt;&gt;groupControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupControl1.Parent" xml:space="preserve">
    <value>xtraScrollableControl1</value>
@@ -1006,7 +1017,7 @@ or a data file from another TV (SCM, TLL, DB, BIN, ...)</value>
  <data name="groupControl2.AppearanceCaption.Font" type="System.Drawing.Font, System.Drawing">
    <value>Tahoma, 12pt</value>
  </data>
-  <data name="labelControl10.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl10.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl10.Location" type="System.Drawing.Point, System.Drawing">
@@ -1026,7 +1037,7 @@ This step can be repeated as needed.</value>
    <value>labelControl10</value>
  </data>
  <data name="&gt;&gt;labelControl10.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl10.Parent" xml:space="preserve">
    <value>groupControl2</value>
@@ -1034,7 +1045,7 @@ This step can be repeated as needed.</value>
  <data name="&gt;&gt;labelControl10.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="labelControl8.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v21.2">
+  <data name="labelControl8.AutoSizeMode" type="DevExpress.XtraEditors.LabelAutoSizeMode, DevExpress.XtraEditors.v22.1">
    <value>Vertical</value>
  </data>
  <data name="labelControl8.Location" type="System.Drawing.Point, System.Drawing">
@@ -1054,7 +1065,7 @@ This step can be repeated as needed.</value>
    <value>labelControl8</value>
  </data>
  <data name="&gt;&gt;labelControl8.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;labelControl8.Parent" xml:space="preserve">
    <value>groupControl2</value>
@@ -1063,10 +1074,10 @@ This step can be repeated as needed.</value>
    <value>1</value>
  </data>
  <data name="groupControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 185</value>
+    <value>12, 148</value>
  </data>
  <data name="groupControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>696, 456</value>
+    <value>696, 448</value>
  </data>
  <data name="groupControl2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1078,7 +1089,7 @@ This step can be repeated as needed.</value>
    <value>groupControl2</value>
  </data>
  <data name="&gt;&gt;groupControl2.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.GroupControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;groupControl2.Parent" xml:space="preserve">
    <value>xtraScrollableControl1</value>
@@ -1093,7 +1104,7 @@ This step can be repeated as needed.</value>
    <value>0, 0</value>
  </data>
  <data name="xtraScrollableControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>708, 646</value>
+    <value>708, 596</value>
  </data>
  <data name="xtraScrollableControl1.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -1102,7 +1113,7 @@ This step can be repeated as needed.</value>
    <value>xtraScrollableControl1</value>
  </data>
  <data name="&gt;&gt;xtraScrollableControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraScrollableControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;xtraScrollableControl1.Parent" xml:space="preserve">
    <value>$this</value>
@@ -1117,7 +1128,7 @@ This step can be repeated as needed.</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>720, 697</value>
+    <value>720, 647</value>
  </data>
  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
    <value>CenterParent</value>
@@ -1129,6 +1140,9 @@ This step can be repeated as needed.</value>
    <value>ReferenceListForm</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="checkEdit1.Properties.Caption" xml:space="preserve">
+    <value>Data/Other</value>
  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.ro.resx
+++ b/source/ChanSort/ReferenceListForm.ro.resx
@@ -214,4 +214,28 @@ Acest pas poate fi repetat după cum este necesar.</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Aplicați lista de referințe</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.ru.resx
+++ b/source/ChanSort/ReferenceListForm.ru.resx
@@ -210,4 +210,28 @@
  <data name="$this.Text" xml:space="preserve">
    <value>Применить базовый список</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.tr.resx
+++ b/source/ChanSort/ReferenceListForm.tr.resx
@@ -216,4 +216,28 @@ veya başka bir TV'den veri dosyası (SCM, TLL, DB, BIN, ...)</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Referans Listesini Uygula</value>
  </data>
+  <data name="comboPrNr.EditValue" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="comboPrNr.Properties.Items1" xml:space="preserve">
+    <value>100</value>
+  </data>
+  <data name="comboPrNr.Properties.Items2" xml:space="preserve">
+    <value>500</value>
+  </data>
+  <data name="comboPrNr.Properties.Items3" xml:space="preserve">
+    <value>1000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items4" xml:space="preserve">
+    <value>2000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items5" xml:space="preserve">
+    <value>5000</value>
+  </data>
+  <data name="comboPrNr.Properties.Items6" xml:space="preserve">
+    <value>7000</value>
+  </data>
 </root>
--- a/source/ChanSort/SkinPickerForm.resx
+++ b/source/ChanSort/SkinPickerForm.resx
@@ -128,7 +128,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnOk.Name" xml:space="preserve">
    <value>btnOk</value>
@@ -143,10 +143,10 @@
    <value>galleryControlClient1</value>
  </data>
  <data name="&gt;&gt;gallery.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.GalleryControl, DevExpress.XtraBars.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;galleryControlClient1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.GalleryControlClient, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraBars.Ribbon.GalleryControlClient, DevExpress.XtraBars.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="panelControl1.Location" type="System.Drawing.Point, System.Drawing">
@@ -156,7 +156,7 @@
    <value>0</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>984, 562</value>
@@ -175,7 +175,7 @@
    <value>2</value>
  </data>
  <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="gallery.Size" type="System.Drawing.Size, System.Drawing">
    <value>984, 527</value>
@@ -196,7 +196,7 @@
    <value>CenterScreen</value>
  </data>
  <data name="&gt;&gt;btnReset.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;btnOk.ZOrder" xml:space="preserve">
    <value>1</value>
@@ -214,7 +214,7 @@
    <value>1</value>
  </data>
  <data name="&gt;&gt;panelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>SkinPickerForm</value>
--- a/source/ChanSort/SkinPickerForm.ru.resx
+++ b/source/ChanSort/SkinPickerForm.ru.resx
@@ -127,6 +127,6 @@
    <value>Цветовая тема</value>
  </data>
  <data name="btnReset.Text" xml:space="preserve">
-    <value>Использовать стандартную тему</value>
+    <value>Использовать стандартную</value>
  </data>
 </root>
--- a/source/ChanSort/WaitForm1.resx
+++ b/source/ChanSort/WaitForm1.resx
@@ -145,7 +145,7 @@
    <value>0, 14, 0, 14</value>
  </data>
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraWaitForm.WaitForm, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraWaitForm.WaitForm, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>WaitForm1</value>
@@ -227,7 +227,7 @@
    <value>Horizontal</value>
  </data>
  <data name="&gt;&gt;progressPanel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v22.1, Version=22.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="progressPanel1.Appearance.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
    <value>Horizontal</value>
--- a/source/Test.Loader.CmdbBin/CmdbBinTest.cs
+++ b/source/Test.Loader.CmdbBin/CmdbBinTest.cs
@@ -0,0 +1,101 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Linq;
+using ChanSort.Api;
+using ChanSort.Loader.CmdbBin;
+
+namespace Test.Loader.CmdbBin
+{
+  [TestClass]
+  public class CmdbBinTest
+  {
+    #region TestGrundigAnalogCable()
+    [TestMethod]
+    public void TestGrundigAnalogCable()
+    {
+      // load existing file and make assertions
+      var path = TestUtils.DeploymentItem(@"Test.Loader.CmdbBin\TestFiles\GrundigAnalogCable\atv_cmdb_cable.bin");
+      var ser = new CmdbFileSerializer(path);
+      ser.Load();
+      ser.DataRoot.ApplyCurrentProgramNumbers();
+
+      var list = ser.DataRoot.GetChannelList(SignalSource.AnalogC);
+      Assert.IsNotNull(list);
+      Assert.AreEqual(SignalSource.AnalogC|SignalSource.Tv, list.SignalSource);
+      Assert.AreEqual(20, list.Channels.Count);
+      Assert.AreEqual("HR", list.Channels[0].Name);
+      Assert.AreEqual("S-12", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 1)?.Name);
+
+      // modify and save file
+      var ard = list.Channels[7];
+      Assert.AreEqual("ARD", ard.Name);
+      var zdf = list.Channels[1];
+      zdf.Name = "ZDF";
+      zdf.IsNameModified = true;
+
+      var ed = new Editor();
+      ed.DataRoot = ser.DataRoot;
+      ed.ChannelList = list;
+      ed.SetSlotNumber(new[] { ard }, 1, false, true );
+      ser.Save(null);
+
+      // load modified file again and verify changes
+      ser = new CmdbFileSerializer(path);
+      ser.Load();
+      list = ser.DataRoot.GetChannelList(SignalSource.AnalogC);
+      Assert.IsNotNull(list);
+      Assert.AreEqual(SignalSource.AnalogC | SignalSource.Tv, list.SignalSource);
+      Assert.AreEqual(20, list.Channels.Count);
+      Assert.AreEqual("HR", list.Channels[0].Name);
+      Assert.AreEqual("ZDF", list.Channels[1].Name);
+      Assert.AreEqual("ARD", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 1)?.Name);
+      Assert.AreEqual("ZDF", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 2)?.Name);
+    }
+    #endregion
+
+    #region TestChangHongDvbS()
+    [TestMethod]
+    public void TestChangHongDvbS()
+    {
+      // load existing file and make assertions
+      TestUtils.DeploymentItem(@"Test.Loader.CmdbBin\TestFiles\TestChangHongDvbS\atv_cmdb_cable.bin");
+      var path = TestUtils.DeploymentItem(@"Test.Loader.CmdbBin\TestFiles\TestChangHongDvbS\dtv_cmdb_2.bin");
+      var ser = new CmdbFileSerializer(path);
+      ser.Load();
+      ser.DataRoot.ApplyCurrentProgramNumbers();
+
+      var list = ser.DataRoot.GetChannelList(SignalSource.AnalogC);
+      Assert.IsNotNull(list);
+      Assert.AreEqual(SignalSource.AnalogC | SignalSource.Tv, list.SignalSource);
+      Assert.AreEqual(20, list.Channels.Count);
+      Assert.AreEqual("HR", list.Channels[0].Name);
+      Assert.AreEqual("S-12", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 1)?.Name);
+
+      // modify and save file
+      var ard = list.Channels[7];
+      Assert.AreEqual("ARD", ard.Name);
+      var zdf = list.Channels[1];
+      zdf.Name = "ZDF";
+      zdf.IsNameModified = true;
+
+      var ed = new Editor();
+      ed.DataRoot = ser.DataRoot;
+      ed.ChannelList = list;
+      ed.SetSlotNumber(new[] { ard }, 1, false, true);
+      ser.Save(null);
+
+      // load modified file again and verify changes
+      ser = new CmdbFileSerializer(path);
+      ser.Load();
+      list = ser.DataRoot.GetChannelList(SignalSource.AnalogC);
+      Assert.IsNotNull(list);
+      Assert.AreEqual(SignalSource.AnalogC | SignalSource.Tv, list.SignalSource);
+      Assert.AreEqual(20, list.Channels.Count);
+      Assert.AreEqual("HR", list.Channels[0].Name);
+      Assert.AreEqual("ZDF", list.Channels[1].Name);
+      Assert.AreEqual("ARD", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 1)?.Name);
+      Assert.AreEqual("ZDF", list.Channels.FirstOrDefault(ch => ch.OldProgramNr == 2)?.Name);
+    }
+    #endregion
+
+  }
+}
--- a/source/Test.Loader.CmdbBin/Properties/AssemblyInfo.cs
+++ b/source/Test.Loader.CmdbBin/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Test.Loader.CmdbBin")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Test.Loader.CmdbBin")]
+[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+
+[assembly: Guid("3b7c25df-645b-4acf-8528-27ef40faf91f")]
+
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/source/Test.Loader.CmdbBin/Test.Loader.CmdbBin.csproj
+++ b/source/Test.Loader.CmdbBin/Test.Loader.CmdbBin.csproj
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3B7C25DF-645B-4ACF-8528-27EF40FAF91F}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Test.Loader.CmdbBin</RootNamespace>
+    <AssemblyName>Test.Loader.CmdbBin</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
+    <IsCodedUITest>False</IsCodedUITest>
+    <TestProjectType>UnitTest</TestProjectType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MSTest.TestFramework.2.2.7\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CmdbBinTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="TestFiles\ChangHongDvbS\atv_cmdb_cable.bin" />
+    <None Include="TestFiles\ChangHongDvbS\dtv_cmdb_2.bin" />
+    <None Include="TestFiles\GrundigAnalogCable\atv_cmdb_cable.bin" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ChanSort.Api\ChanSort.Api.csproj">
+      <Project>{dccffa08-472b-4d17-bb90-8f513fc01392}</Project>
+      <Name>ChanSort.Api</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ChanSort.Loader.CmdbBin\ChanSort.Loader.CmdbBin.csproj">
+      <Project>{b594dda4-7bd5-450e-b648-668e0f659813}</Project>
+      <Name>ChanSort.Loader.CmdbBin</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Test.Loader\Test.Loader.csproj">
+      <Project>{68cfcb2f-b52a-43a1-aa5c-5d64a1d655d2}</Project>
+      <Name>Test.Loader</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.2.7\build\net45\MSTest.TestAdapter.targets')" />
+</Project>
--- a/source/Test.Loader.CmdbBin/TestFiles/ChangHongDvbS/atv_cmdb_cable.bin
+++ b/source/Test.Loader.CmdbBin/TestFiles/ChangHongDvbS/atv_cmdb_cable.bin
--- a/source/Test.Loader.CmdbBin/TestFiles/ChangHongDvbS/dtv_cmdb_2.bin
+++ b/source/Test.Loader.CmdbBin/TestFiles/ChangHongDvbS/dtv_cmdb_2.bin
--- a/source/Test.Loader.CmdbBin/TestFiles/GrundigAnalogCable/atv_cmdb_cable.bin
+++ b/source/Test.Loader.CmdbBin/TestFiles/GrundigAnalogCable/atv_cmdb_cable.bin
--- a/source/Test.Loader.CmdbBin/packages.config
+++ b/source/Test.Loader.CmdbBin/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="2.2.7" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.2.7" targetFramework="net472" />
+</packages>
--- a/source/Translation.xlsx
+++ b/source/Translation.xlsx
--- a/source/changelog.md
+++ b/source/changelog.md
@@ -1,6 +1,11 @@
-ChanSort Change Log 
+ChanSort Change Log 
 ===================

+2022-07-03
+- experimental support for Grundig and ChangHong atv\_cmdb.bin files (analog antenna and cable TV)
+- Reference list dialog further optimized to fit 1920x1080 @150% or 1024x768 @100% screens
+- re-imported translation file (to fix incorrect letters in language names like "Русский")
+
 2022-04-19
 - added support for Orsay .zip files which contain a Clone/map-AirD and other files similar to Samsung .scm
 - Reference list dialog is now resizable
@@ -364,7 +369,7 @@ ChanSort Change Log
 - fixed error when opening reference list dialog

 2019-12-29
- Added Spanish translation (thanks to Marco S<EFBFBD>nchez!)
+- Added Spanish translation (thanks to Marco Sánchez!)
 - Added support for Philips "ChannelMap" favorites lists (1-8)

 2019-11-24
@@ -932,60 +937,60 @@ ChanSort Change Log
  channels in red)

 2013-03-30
- FIX: bei nicht-LM Ger<EFBFBD>ten wurden die DVB-S Programmnummern falsch ausgelesen
- Hotelmodus/DTV-channel-update kann nun bei allen LG serien ge<EFBFBD>ndert werden
+- FIX: bei nicht-LM Geräten wurden die DVB-S Programmnummern falsch ausgelesen
+- Hotelmodus/DTV-channel-update kann nun bei allen LG serien geändert werden

 2013-03-29
 - LG: Doppelt vorhandene Sender (die automatisch vom TV bei der Sendersuche
-  mit L<EFBFBD>ndervoreinstellung angelegt werden) werden nun automatisch gel<EFBFBD>scht.
-  Diese f<EFBFBD>hren am TV h<EFBFBD>ufig dazu, dass Sender zuf<EFBFBD>llig zwischen deren
-  Programmpl<EFBFBD>tzen hin- und herspringen. (Bug im TV, unabh<EFBFBD>ngig von ChanSort)
- LG: Sender k<EFBFBD>nnen nun gel<EFBFBD>scht werden ("Nicht explizit sortierte Sender: L<EFBFBD>schen")
- LG: <EFBFBD>ndern von Sendernamen m<EFBFBD>glich (um bei DVB-C/T/S die Namen nicht wieder
+  mit Ländervoreinstellung angelegt werden) werden nun automatisch gelöscht.
+  Diese führen am TV häufig dazu, dass Sender zufällig zwischen deren
+  Programmplätzen hin- und herspringen. (Bug im TV, unabhängig von ChanSort)
+- LG: Sender können nun gelöscht werden ("Nicht explizit sortierte Sender: Löschen")
+- LG: Ändern von Sendernamen möglich (um bei DVB-C/T/S die Namen nicht wieder
  zu verlieren, muss Hotel-Mode=ein und DTV channel update="manual" sein)
- LG: F<EFBFBD>r die LM-Serie kann nun innerhalb von ChanSort der Hotel-Modus bzw
+- LG: Für die LM-Serie kann nun innerhalb von ChanSort der Hotel-Modus bzw
  die Senderlisten-Aktualisierung ein-/ausgeschaltet werden.

 2013-02-26
- Neuer Bearbeitungsmodus "Tauschen" eingebaut, mit dem beim <EFBFBD>ndern der
+- Neuer Bearbeitungsmodus "Tauschen" eingebaut, mit dem beim Ändern der
  Programmnummer die beiden Sender ihre Nummer tauschen und alle anderen
-  Nummern unver<EFBFBD>ndert bleiben.
- Beim <EFBFBD>ffnen einer TV-Datei ohne zugeh<EFBFBD>riger Referenzliste werden nun
-  automatisch alle Sender in die "Sortierte Liste" <EFBFBD>bernommen.
+  Nummern unverändert bleiben.
+- Beim Öffnen einer TV-Datei ohne zugehöriger Referenzliste werden nun
+  automatisch alle Sender in die "Sortierte Liste" übernommen.
 - "Speichern unter" funktioniert nun auch mit Samsung's SCM Dateien
- Wenn beim Speichern ein Fehler auftritt, wird nun auf m<EFBFBD>gliche Ursachen 
+- Wenn beim Speichern ein Fehler auftritt, wird nun auf mögliche Ursachen 
  hingewiesen

 2013-02-11
 - Mehrfach vorhandene Sender werden nun getrennt angezeigt, wenn sie 
  unterschiedlichen Programmnummern zugewiesen sind (z.B. DVB-T Empfang des 
-  gleichen Senders <EFBFBD>ber verschiedene Sendeanlagen).
- Beim <EFBFBD>ndern der Programmnr auf eine bisher nicht verwendete Nummer werden
-  die Programmnummern hinter der neuen Nummer nicht mehr erh<EFBFBD>ht.
+  gleichen Senders über verschiedene Sendeanlagen).
+- Beim Ändern der Programmnr auf eine bisher nicht verwendete Nummer werden
+  die Programmnummern hinter der neuen Nummer nicht mehr erhöht.

 2013-02-04
- Unterst<EFBFBD>tzung f<EFBFBD>r Samsung "AstraHDPlus" Senderliste hinzugef<EFBFBD>gt
- Funktion zum <EFBFBD>bernehmen der bestehenden Senderliste in die sortierte Liste
+- Unterstützung für Samsung "AstraHDPlus" Senderliste hinzugefügt
+- Funktion zum Übernehmen der bestehenden Senderliste in die sortierte Liste

 2013-01-22
- Fix: Import von .chl Referenzlisten, wenn der gleiche Sendername <EFBFBD>ber
+- Fix: Import von .chl Referenzlisten, wenn der gleiche Sendername über
  mehrere Satelliten empfangen wird und dort dem gleichen TSID zugewiesen ist.

 2013-01-16
 - Import von .chl Referenzlisten von SamToolBox
- Samsung Senderlisten zeigen nun "verschl<EFBFBD>sselt"-Info an
+- Samsung Senderlisten zeigen nun "verschlüsselt"-Info an
 - FIX: Mehrfachauswahl in den Senderlisten (mit Strg/Shift + Maus/Cursortasten)
 - FIX: Warnung statt Absturz bei mehrfach vergebenen Transponder-IDs (.SCM Datei)

 2013-01-15
- Samsung Serie E wird nun unterst<EFBFBD>tzt
+- Samsung Serie E wird nun unterstützt
 - Favoritenliste der Samsung Serie D und E  wird nun erkannt
 - Samsung Modellerkennung verbessert

 2012-12-26
- Unterst<EFBFBD>tzung f<EFBFBD>r Samsung Fernseher hinzugef<EFBFBD>gt
- Funktion zum <EFBFBD>ffnen einer Referenzliste hinzugef<EFBFBD>gt
- Funktion zum kompletten L<EFBFBD>schen der Senderlisten f<EFBFBD>r LG Fernseher
+- Unterstützung für Samsung Fernseher hinzugefügt
+- Funktion zum Öffnen einer Referenzliste hinzugefügt
+- Funktion zum kompletten Löschen der Senderlisten für LG Fernseher
 - Diverse Bugfixes

 2012-11-07
@@ -995,11 +1000,11 @@ ChanSort Change Log

 2012-11-06
 - Fix: Analoge Senderliste wurde nicht korrekt gespeichert
- Fix: Hinzuf<EFBFBD>gen von Sendern zu einer leeren Liste
- Setzen von Favoriten m<EFBFBD>glich
- Setzen von Sender sperren / <EFBFBD>berspringen / verstecken
+- Fix: Hinzufügen von Sendern zu einer leeren Liste
+- Setzen von Favoriten möglich
+- Setzen von Sender sperren / überspringen / verstecken
 - Direkte Eingabe von neuer Programmnr in den Tabellen
- Kontextmen<EFBFBD> <20>ber rechte Maustaste
+- Kontextmenü über rechte Maustaste

 2012-11-05
 - Fix: DVB-C/T Senderliste wurde nicht korrekt gespeichert
@@ -1010,39 +1015,39 @@ ChanSort Change Log
 - Mehrfach vorhandene Sender werden nun nicht mehr ausgefiltert

 2012-11-01
- UI und internes Datenmodell komplett <EFBFBD>berarbeitet
- Getrennte Listen f<EFBFBD>r Analog, DVB-C/T, DVB-S in jeweils Radio/TV
+- UI und internes Datenmodell komplett überarbeitet
+- Getrennte Listen für Analog, DVB-C/T, DVB-S in jeweils Radio/TV

 2012-10-30
- Unterst<EFBFBD>tzung f<EFBFBD>r LG Serie CS, LD, LE, LH und PM hinzugef<EFBFBD>gt
- Neue Serien k<EFBFBD>nnen durch Anpassen einer .INI Datei hinzugef<EFBFBD>gt werden
- Automatischer Test im Sourcecode, der alle bekannten TLLs l<EFBFBD>dt
- Hilfe-Men<EFBFBD> hinzugef<EFBFBD>gt
+- Unterstützung für LG Serie CS, LD, LE, LH und PM hinzugefügt
+- Neue Serien können durch Anpassen einer .INI Datei hinzugefügt werden
+- Automatischer Test im Sourcecode, der alle bekannten TLLs lädt
+- Hilfe-Menü hinzugefügt

 2012-10-29
 - Plugin zum direkten Laden/Speichern von TLLs, ohne TLLsort.exe
- Unterst<EFBFBD>tzung f<EFBFBD>r LG Serie LV und LW hinzugef<EFBFBD>gt
- Sourcen ver<EFBFBD>ffentlicht
+- Unterstützung für LG Serie LV und LW hinzugefügt
+- Sourcen veröffentlicht

 2012-10-26
 - Programm umbenannt von TLLsortGUI auf ChanSort
- <EFBFBD>bersetzt in Englisch und <EFBFBD>sterreichisch
- Einstellungen werden beim Beenden/Speichern des Programms <EFBFBD>bernommen
- Ausgew<EFBFBD>hlten Zeilen in der sortierten Liste alphabetisch sortieren
- Dateinamen f<EFBFBD>r Speichern k<EFBFBD>nnen ge<EFBFBD>ndert werden
- Unterst<EFBFBD>tzung f<EFBFBD>r Plugin-DLLs f<EFBFBD>r verschiedene TV-Modelle
+- Übersetzt in Englisch und Österreichisch
+- Einstellungen werden beim Beenden/Speichern des Programms übernommen
+- Ausgewählten Zeilen in der sortierten Liste alphabetisch sortieren
+- Dateinamen für Speichern können geändert werden
+- Unterstützung für Plugin-DLLs für verschiedene TV-Modelle

 2012-10-25
- Neu: Wenn eine Gruppenzeile (Sat, Analog, CableAndTerrestic) ausgew<EFBFBD>hlt
-  ist, werden alle darin enthaltene Sender eingef<EFBFBD>gt bzw. entfernt.
- Bugfix: Eingabefelder f<EFBFBD>r Einf<EFBFBD>gepositionen erlauben nun keine 
-  ung<EFBFBD>ltigen (sprich zu hohe, nicht fortlaufende) Nummern mehr.
+- Neu: Wenn eine Gruppenzeile (Sat, Analog, CableAndTerrestic) ausgewählt
+  ist, werden alle darin enthaltene Sender eingefügt bzw. entfernt.
+- Bugfix: Eingabefelder für Einfügepositionen erlauben nun keine 
+  ungültigen (sprich zu hohe, nicht fortlaufende) Nummern mehr.

 2012-10-24 (14:52 MESZ)
 - Bugfix: Fehler beim Einlesen der TLL-Datei, wenn der gleiche Sender 
  (sprich Uid) mehrfach enthalten war. Kann vermutlich passieren, wenn 
-  ein Sendersuchlauf 2x durchgef<EFBFBD>hrt wurde, ohne die alten Programme zu
-  l<EFBFBD>schen.
+  ein Sendersuchlauf 2x durchgeführt wurde, ohne die alten Programme zu
+  löschen.

 2012-10-24 (#1)
- erste Ver<EFBFBD>ffentlichung
+- erste Veröffentlichung
--- a/source/makeDistribZip.cmd
+++ b/source/makeDistribZip.cmd
@@ -6,7 +6,7 @@ cd /d %~dp0
 set languages=cs de es hu pl pt ro ru tr
 set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2%
 set target=%cd%\..\..\ChanSort_%curdate%
-set DXversion=21.2
+set DXversion=22.1
 mkdir "%target%" 2>nul
 rem del /s /q "%target%\*"
 xcopy /idy debug\ChanSort.exe* "%target%"
@@ -34,7 +34,7 @@ mkdir "%target%\ReferenceLists" 2>nul
 xcopy /sidy ChanSort\ReferenceLists\* "%target%\ReferenceLists"
 copy /y ..\readme.md "%target%\readme.txt"
 copy /y changelog.md "%target%\changelog.txt"
-for %%f in (Utils Data Data.Desktop DataAccess Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f
+for %%f in (Utils Data Data.Desktop DataAccess Drawing Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f
 call :CodeSigning

 cd ..
@@ -88,19 +88,19 @@ goto:eof

 :copyDll
 echo Copying DevExpress %1
-set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.dll"
+set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.dll"
 if exist %source% xcopy /idy %source% "%target%"
-set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.Core.dll"
+set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.Core.dll"
 if exist %source% xcopy /idy %source% "%target%"
 for %%l in (%languages%) do call :copyLangDll %1 %%l
 goto:eof

 :copyLangDll
-set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.resources.dll"
+set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.resources.dll"
 if exist %source% xcopy /idy %source% "%target%\%2"
 set source="d:\downloads\DevExpress\20%DXversion%\DevExpressLocalizedResources_20%DXversion%_%2\DevExpress.%1.v%DXversion%.resources.dll"
 if exist %source% xcopy /idy %source% "%target%\%2"
-set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.Core.resources.dll"
+set source="C:\Program Files\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.Core.resources.dll"
 if exist %source% xcopy /idy %source% "%target%\%2"
 set source="d:\downloads\DevExpress\20%DXversion%\DevExpressLocalizedResources_20%DXversion%_%2\DevExpress.%1.v%DXversion%.Core.resources.dll"
 if exist %source% xcopy /idy %source% "%target%\%2"