- improved swapping of channels by double clicking

- improved adding of channels (when they already have a new channel number) - added predefined reference lists
2026-02-08 15:36:46 +01:00 · 2016-05-06 23:54:54 +02:00
parent 3cfe7b3626
commit 7d1850ce45
20 changed files with 3499 additions and 627 deletions
--- a/source/ChanSort/ChanSort.csproj
+++ b/source/ChanSort/ChanSort.csproj
@@ -325,6 +325,14 @@
  <ItemGroup>
    <None Include="Resources\btn_donateCC_LG_de.gif" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="ReferenceLists\at_astra192E_hd.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="ReferenceLists\at_cable_liwest.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/source/ChanSort/GlobalImageCollection.cs
+++ b/source/ChanSort/GlobalImageCollection.cs
@@ -55,6 +55,9 @@ namespace ChanSort.Ui
      this.sharedImageCollection1.ImageSource.ImageStream = ((DevExpress.Utils.ImageCollectionStreamer)(resources.GetObject("sharedImageCollection1.ImageSource.ImageStream")));
      this.sharedImageCollection1.ImageSource.Images.SetKeyName(36, "0036.png");
      this.sharedImageCollection1.ImageSource.Images.SetKeyName(37, "0037.png");
+      this.sharedImageCollection1.ImageSource.Images.SetKeyName(38, "0038.png");
+      this.sharedImageCollection1.ImageSource.Images.SetKeyName(39, "0039.png");
+      this.sharedImageCollection1.ImageSource.Images.SetKeyName(40, "0040.png");
      this.sharedImageCollection1.ParentControl = null;
      ((System.ComponentModel.ISupportInitialize)(this.sharedImageCollection1.ImageSource)).EndInit();
      ((System.ComponentModel.ISupportInitialize)(this.sharedImageCollection1)).EndInit();
--- a/source/ChanSort/GlobalImageCollection.resx
+++ b/source/ChanSort/GlobalImageCollection.resx
@@ -123,13 +123,13 @@
  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="sharedImageCollection1.ImageSource.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu
-        OC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
+        NS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT
        eXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRv
        a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0
        cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P//
        /xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAABAAAAAQAAAACQUAAAAP
-        BQAAAHdpAAAC2AIAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
+        BQAAAG9wAAAC2AIAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAACukAAArpAf11ztMAAAAHdElNRQfWAwEODCaDia/cAAACZ0lEQVQ4T82S7UsTUBSH
        75eCCAx6oTAqg7BMRKjoQ6S9Oa1I10gzU8PUZmYpKEamy8gCX8iS2YxqiRmREMrUltEoLdSMps458wXU
        EiW0UToNbdTTpaLtP6gDlwuXe57zO79zxP8RC1M7CCzqRSR0IZI7EepOvLO7CI4qRRGpxTejGRHTioiV
@@ -555,36 +555,65 @@
        +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
-        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
-        SUVORK5CYIIL
+        0qK0ULgL8396FOUH+S3R+WNR2LkAAAAASUVORK5CYIIRAgAAiVBORw0KGgoAAAANSUhEUgAAABAAAAAQ
+        CAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAAH5QTFRFTC0AjFQAi1MAj1YAjlUAi1QA/5oA9ZUAuW8A
+        8JEA/5sAyXgA95YA+ZYAhE8ADAcAb0IA85MAgE0AEwwAiFIA+pYACgYAAAAABAMAcUQA9JQA+JYAf0wA
+        CAUA+JUAFw4ABQMAeEgADwkAAwIABAIA8pEABwQAAgEAAQEA9ZQAu/v75QAAAAlwSFlzAAAWuQAAFrkB
+        /gI33gAAABN0RVh0QXV0aG9yAHl2ZXMgZ3VpbGxvdcKWtaUAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtz
+        Y2FwZS5vcmeb7jwaAAAAHHRFWHRTb3VyY2UAT3BlbiBDbGlwIEFydCBMaWJyYXJ5mMdI9wAAAL1JREFU
+        KFMdUNsWQ0AMTBahLEVVbFFUr///g53IQzIzZ08ms0TsOGKH4hiQKBFJs1MuGIUXSchJWZ3rRsS3l64U
+        R3zteh3CbZxm7as7U1wsqrqGbcZ4ZBHxvTW4P9GG+sXY4ac3CGoNTe4gyLh9jH/DT7AUwi98Tfhs4yHk
+        TViNq74nb7avegB57mhzC9soexjcjmdLEcO26nWexlsYtO+uZlt2lxYpmvpc2ekI54sU2fJThpEc8ZHb
+        4uMXmP5ZKA+1EK/62gAAAABJRU5ErkJgglUDAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIAwAAACgt
+        D1MAAAAEZ0FNQQAAsY8L/GEFAAABgFBMVEVMLQCMVACLUwCNVQCOVQCKUwCLVACPVgD/mgD+mgDdhQCu
+        aACYWwCXWgCnZADiiAD/mwD/mQCrZwCDTgDKeQDliQDehQC3bgCGUQDDdQDZggCGUADwkQDvkACRVwDj
+        iACiYQD3lACIUgC0bACZXABOLgDehgD/nQDQfgBfOgCkYwDAdAAvHACWWgDnigDagwBvQgCFUABQMAC/
+        cwD7lwDUfwDnjABuQgBTMgAAAAClYwC2bgAFAwA7JADxkgD+mQBpPwB3RwCBTgBMLgCTWABtQQCXWwC6
+        cADPfAC1bAB6SQBZNgCATQBmPgA/JgDligBjOwCeXwCpZQDrjQDGdwDBdAAyHgBAJwCHUQBnPgAZDwCS
+        VwDhhwD2lAD/nAD2lQBmPQAiFQBOLwA0HwBUMwDQfQDXgQCVWQBcNwByRQBxRABzRQCtaAD7lgB2RwCQ
+        VwCvaQCjYgCqZgCsZwCcXQDfhgDkiQC+cgD9mQD4lgDujwDykQC9cQD0kwCJUgCCTgDais/UAAAACXBI
+        WXMAABa5AAAWuQH+AjfeAAAAE3RFWHRBdXRob3IAeXZlcyBndWlsbG91wpa1pQAAABl0RVh0U29mdHdh
+        cmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAcdEVYdFNvdXJjZQBPcGVuIENsaXAgQXJ0IExpYnJhcnmY
+        x0j3AAAA/0lEQVQoU2NgYGRiYmJmYWVjZwYyGBkY2Dg4ODi5uHl4+fgFgEw2BiYOQUEhYRFRMXEJSQ5B
+        DiagAIeUtAxQUkBWTp4DLCCgwKIoKCjIIaqkLAARUFFVUweq0NDUgqhQ19YR0tXTNzA0MgapYDMxNTO3
+        sLSytrE1tJOxZ2JgkXJQcXRylnZxddN1Z/FgZmD39DL09uHy9fNXCAjkC2JkYAwOCeUJC2eNiIyKDomJ
+        BTksTj0+IVEnKTklVT0OZItAWlB6RmZWdqBPTqpYLlBFnG6eYT4PX0FhUbFnSSkzA5tAmXR5RaW+aZVA
+        dU1hLdC7jIysjGxsLCyMTIx19YwMAEZ9KFMBvKCnAAAAAElFTkSuQmCCswEAAIlQTkcNChoKAAAADUlI
+        RFIAAAAQAAAAEAgGAAAAH/P/YQAAAAFzUkdCAK7OHOkAAAAEZ0FNQQAAsY8L/GEFAAAAGXRFWHRTb2Z0
+        d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAThJREFUOE+l0s0rRGEYBfCnSFOTr4WPGRZiIWrohtiM
+        Hd0/wEZmZanZSZrNlCSSpNiINStLMz4WFrLRFYmixM5XSYkmdXU85zas3nTfTP3mvZ33nOkuRgD8izG0
+        YQxtGEMb0jF7Ln0rd9K//uCq1eTavTjzl0a8Y4ddbrgNvnqXbxl41L14bRwT73563AQ/kJg544O3cPUF
+        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
 </value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="SharedImageCollection.Timestamp" type="System.DateTime, mscorlib">
-    <value>11/27/2015 01:18:01</value>
+    <value>05/06/2016 20:08:51</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="SharedImageCollection.ImageSize" type="System.Drawing.Size, System.Drawing">
--- a/source/ChanSort/MainForm.Designer.cs
+++ b/source/ChanSort/MainForm.Designer.cs
@@ -76,25 +76,25 @@
      this.colSkip = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colHidden = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colEncrypted = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colChannelOrTransponder = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colFreqInMhz = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colServiceId = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colVideoPid = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colAudioPid = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colServiceType = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colServiceTypeName = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colFreqInMhz = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colChannelOrTransponder = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colSatellite = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colNetworkId = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colTransportStreamId = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colServiceId = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colVideoPid = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colAudioPid = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colSymbolRate = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colPolarity = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colUid = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colNetworkName = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colNetworkOperator = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colProvider = new DevExpress.XtraGrid.Columns.GridColumn();
-      this.colDebug = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colUid = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colLogicalIndex = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colSignalSource = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colDebug = new DevExpress.XtraGrid.Columns.GridColumn();
      this.lblHotkeyRight = new DevExpress.XtraEditors.LabelControl();
      this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
      this.lblPredefinedList = new DevExpress.XtraEditors.LabelControl();
@@ -726,42 +726,6 @@
      this.colEncrypted.OptionsColumn.AllowEdit = false;
      this.colEncrypted.OptionsColumn.FixedWidth = true;
      // 
-      // colChannelOrTransponder
-      // 
-      resources.ApplyResources(this.colChannelOrTransponder, "colChannelOrTransponder");
-      this.colChannelOrTransponder.FieldName = "ChannelOrTransponder";
-      this.colChannelOrTransponder.Name = "colChannelOrTransponder";
-      this.colChannelOrTransponder.OptionsColumn.AllowEdit = false;
-      // 
-      // colFreqInMhz
-      // 
-      resources.ApplyResources(this.colFreqInMhz, "colFreqInMhz");
-      this.colFreqInMhz.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
-      this.colFreqInMhz.FieldName = "FreqInMhz";
-      this.colFreqInMhz.Name = "colFreqInMhz";
-      this.colFreqInMhz.OptionsColumn.AllowEdit = false;
-      // 
-      // colServiceId
-      // 
-      resources.ApplyResources(this.colServiceId, "colServiceId");
-      this.colServiceId.FieldName = "ServiceId";
-      this.colServiceId.Name = "colServiceId";
-      this.colServiceId.OptionsColumn.AllowEdit = false;
-      // 
-      // colVideoPid
-      // 
-      resources.ApplyResources(this.colVideoPid, "colVideoPid");
-      this.colVideoPid.FieldName = "VideoPid";
-      this.colVideoPid.Name = "colVideoPid";
-      this.colVideoPid.OptionsColumn.AllowEdit = false;
-      // 
-      // colAudioPid
-      // 
-      resources.ApplyResources(this.colAudioPid, "colAudioPid");
-      this.colAudioPid.FieldName = "AudioPid";
-      this.colAudioPid.Name = "colAudioPid";
-      this.colAudioPid.OptionsColumn.AllowEdit = false;
-      // 
      // colServiceType
      // 
      resources.ApplyResources(this.colServiceType, "colServiceType");
@@ -776,6 +740,21 @@
      this.colServiceTypeName.Name = "colServiceTypeName";
      this.colServiceTypeName.OptionsColumn.AllowEdit = false;
      // 
+      // colFreqInMhz
+      // 
+      resources.ApplyResources(this.colFreqInMhz, "colFreqInMhz");
+      this.colFreqInMhz.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+      this.colFreqInMhz.FieldName = "FreqInMhz";
+      this.colFreqInMhz.Name = "colFreqInMhz";
+      this.colFreqInMhz.OptionsColumn.AllowEdit = false;
+      // 
+      // colChannelOrTransponder
+      // 
+      resources.ApplyResources(this.colChannelOrTransponder, "colChannelOrTransponder");
+      this.colChannelOrTransponder.FieldName = "ChannelOrTransponder";
+      this.colChannelOrTransponder.Name = "colChannelOrTransponder";
+      this.colChannelOrTransponder.OptionsColumn.AllowEdit = false;
+      // 
      // colSatellite
      // 
      resources.ApplyResources(this.colSatellite, "colSatellite");
@@ -797,6 +776,27 @@
      this.colTransportStreamId.Name = "colTransportStreamId";
      this.colTransportStreamId.OptionsColumn.AllowEdit = false;
      // 
+      // colServiceId
+      // 
+      resources.ApplyResources(this.colServiceId, "colServiceId");
+      this.colServiceId.FieldName = "ServiceId";
+      this.colServiceId.Name = "colServiceId";
+      this.colServiceId.OptionsColumn.AllowEdit = false;
+      // 
+      // colVideoPid
+      // 
+      resources.ApplyResources(this.colVideoPid, "colVideoPid");
+      this.colVideoPid.FieldName = "VideoPid";
+      this.colVideoPid.Name = "colVideoPid";
+      this.colVideoPid.OptionsColumn.AllowEdit = false;
+      // 
+      // colAudioPid
+      // 
+      resources.ApplyResources(this.colAudioPid, "colAudioPid");
+      this.colAudioPid.FieldName = "AudioPid";
+      this.colAudioPid.Name = "colAudioPid";
+      this.colAudioPid.OptionsColumn.AllowEdit = false;
+      // 
      // colSymbolRate
      // 
      resources.ApplyResources(this.colSymbolRate, "colSymbolRate");
@@ -811,13 +811,6 @@
      this.colPolarity.Name = "colPolarity";
      this.colPolarity.OptionsColumn.AllowEdit = false;
      // 
-      // colUid
-      // 
-      resources.ApplyResources(this.colUid, "colUid");
-      this.colUid.FieldName = "Uid";
-      this.colUid.Name = "colUid";
-      this.colUid.OptionsColumn.AllowEdit = false;
-      // 
      // colNetworkName
      // 
      resources.ApplyResources(this.colNetworkName, "colNetworkName");
@@ -839,11 +832,12 @@
      this.colProvider.Name = "colProvider";
      this.colProvider.OptionsColumn.AllowEdit = false;
      // 
-      // colDebug
+      // colUid
      // 
-      this.colDebug.FieldName = "Debug";
-      this.colDebug.Name = "colDebug";
-      this.colDebug.OptionsColumn.AllowEdit = false;
+      resources.ApplyResources(this.colUid, "colUid");
+      this.colUid.FieldName = "Uid";
+      this.colUid.Name = "colUid";
+      this.colUid.OptionsColumn.AllowEdit = false;
      // 
      // colLogicalIndex
      // 
@@ -860,6 +854,12 @@
      this.colSignalSource.Name = "colSignalSource";
      this.colSignalSource.OptionsColumn.AllowEdit = false;
      // 
+      // colDebug
+      // 
+      this.colDebug.FieldName = "Debug";
+      this.colDebug.Name = "colDebug";
+      this.colDebug.OptionsColumn.AllowEdit = false;
+      // 
      // lblHotkeyRight
      // 
      resources.ApplyResources(this.lblHotkeyRight, "lblHotkeyRight");
@@ -908,7 +908,7 @@
      // 
      // btnAdd
      // 
-      this.btnAdd.ImageIndex = 26;
+      this.btnAdd.ImageIndex = 39;
      this.btnAdd.ImageList = this.globalImageCollection1;
      resources.ApplyResources(this.btnAdd, "btnAdd");
      this.btnAdd.Name = "btnAdd";
--- a/source/ChanSort/MainForm.cs
+++ b/source/ChanSort/MainForm.cs
@@ -532,6 +532,7 @@ namespace ChanSort.Ui
      {
        this.DataRoot.ApplyCurrentProgramNumbers();
        this.RefreshGrid(this.gviewLeft, this.gviewRight);
+        this.rbInsertSwap.Checked = true;
      }
    }

@@ -541,47 +542,7 @@ namespace ChanSort.Ui

    private void ShowOpenReferenceFileDialog(bool addChannels)
    {
-#if false
-      using (OpenFileDialog dlg = new OpenFileDialog())
-      {
-        dlg.Title = Resources.MainForm_ShowOpenReferenceFileDialog_Title;
-
-        var dir = Path.GetDirectoryName(this.currentTvFile);
-        var file = Path.GetFileNameWithoutExtension(this.currentTvFile) + ".csv";
-        var path = dir + "\\" + file;
-        if (File.Exists(path))
-        {
-          dlg.InitialDirectory = dir;
-          dlg.FileName = file; // path
-        }
-        else
-        {
-          dlg.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);          
-        }
-        string supportedExtensions;
-        int numberOfFilters;
-        string filter = this.GetTvDataFileFilter(out supportedExtensions, out numberOfFilters);
-        filter = "ChanSort|*.csv|SamToolBox|*.chl|" + filter;
-        supportedExtensions = "*.csv;*.chl;" + supportedExtensions;
-        dlg.AddExtension = true;
-        dlg.AutoUpgradeEnabled = true;
-        dlg.CheckFileExists = true;
-        dlg.DefaultExt = ".csv";
-        dlg.DereferenceLinks = true;
-        dlg.Filter = filter + string.Format(Resources.MainForm_FileDialog_OpenFileFilter, supportedExtensions);
-        dlg.FilterIndex = numberOfFilters + 3;
-        dlg.RestoreDirectory = true;
-        dlg.SupportMultiDottedExtensions = false;
-        dlg.ValidateNames = true;
-        dlg.Title = this.miOpenReferenceFile.Caption;
-        if (dlg.ShowDialog(this) == DialogResult.OK)
-        {
-          this.LoadReferenceFile(dlg.FileName, addChannels);
-        }
-      }
-#else
      new ReferenceListForm(this).ShowDialog(this);
-#endif
    }

    #endregion
@@ -894,15 +855,35 @@ namespace ChanSort.Ui

    private void AddChannels()
    {
-      var selectedChannels = this.GetSelectedChannels(gviewRight);
-      if (selectedChannels.Count == 0) return;
-
      if (this.rbInsertSwap.Checked)
-        this.RemoveChannels(this.gviewLeft, this.cbCloseGap.Checked);
+      {
+        this.SwapChannels();
+        return;
+      }
+
+      var selectedChannels = this.GetSelectedChannels(gviewRight);
+      if (selectedChannels.Count == 0) return;      

      ChannelInfo lastInsertedChannel;
      this.gviewLeft.BeginDataUpdate();
      this.gviewRight.BeginDataUpdate();
+
+      // remove all the selected channels which are about to be added. 
+      // This may require an adjustment of the insert position when channels are removed in front of it and gaps are closed.
+      var insertSlot = this.CurrentChannelList.InsertProgramNumber;
+      var contextRow = (ChannelInfo)this.gviewLeft.GetFocusedRow();
+      if (contextRow != null)
+      {
+        if (!(this.rbInsertBefore.Checked && insertSlot == contextRow.NewProgramNr || this.rbInsertAfter.Checked && insertSlot == contextRow.NewProgramNr + 1))
+          contextRow = null;
+      }
+      this.RemoveChannels(gviewRight, this.cbCloseGap.Checked);
+      if (contextRow != null)
+        this.CurrentChannelList.InsertProgramNumber = this.rbInsertBefore.Checked ? contextRow.NewProgramNr : contextRow.NewProgramNr + 1;
+      else
+        this.CurrentChannelList.InsertProgramNumber = insertSlot;
+
+
      try
      {
        lastInsertedChannel = this.Editor.AddChannels(selectedChannels);
@@ -929,6 +910,58 @@ namespace ChanSort.Ui

    #endregion

+    #region SwapChannels()
+    private void SwapChannels()
+    {
+      if (this.gviewRight.SelectedRowsCount == 0)
+        return;
+
+      if (this.gviewLeft.SelectedRowsCount != this.gviewRight.SelectedRowsCount)
+      {
+        XtraMessageBox.Show(this, Resources.MainForm_SwapChannels_RowCountMsg, Resources.MainForm_SwapChannels_RowCountTitle, MessageBoxButtons.OK, MessageBoxIcon.Information);
+        return;
+      }
+
+      // get selected channel objects from left and right grid before we start modifying the data
+      var leftChannels = this.GetSelectedChannels(gviewLeft);
+      var rightChannels = this.GetSelectedChannels(gviewRight);
+
+      // swap channel numbers
+      ChannelInfo ch1 = null, ch2 = null;
+      for (int i = 0, c = leftChannels.Count; i < c; i++)
+      {
+        ch1 = leftChannels[i];
+        ch2 = rightChannels[i];
+        int p = ch1.NewProgramNr;
+        ch1.NewProgramNr = ch2.NewProgramNr;
+        ch2.NewProgramNr = p;
+      }
+
+      // resort the grids
+      this.RefreshGrids();
+
+      // in the left grid, select the last swapped channel from the right grid
+      this.gviewLeft.ClearSelection();
+      var h = this.gviewLeft.GetRowHandle(this.CurrentChannelList.Channels.IndexOf(ch2));
+      if (h >= 0)
+      {
+        this.gviewLeft.SelectRow(h);
+        this.gviewLeft.FocusedRowHandle = h;
+        this.gviewLeft.MakeRowVisible(h);
+      }
+
+      // in the right grid, select the last swapped channel from the left grid
+      this.gviewRight.ClearSelection();
+      h = this.gviewRight.GetRowHandle(this.CurrentChannelList.Channels.IndexOf(ch1));
+      if (h >= 0)
+      {
+        this.gviewRight.SelectRow(h);
+        this.gviewRight.FocusedRowHandle = h;
+        this.gviewRight.MakeRowVisible(h);
+      }
+    }
+    #endregion
+
    #region RemoveChannels()

    private void RemoveChannels(GridView grid, bool closeGap)
@@ -1006,6 +1039,7 @@ namespace ChanSort.Ui
      try
      {
        this.Editor.SetSlotNumber(selectedChannels, prog, this.rbInsertSwap.Checked, this.cbCloseGap.Checked);
+        this.txtSetSlot.Text = (prog + selectedChannels.Count).ToString();
      }
      finally
      {
@@ -2175,7 +2209,17 @@ namespace ChanSort.Ui
    private void gviewRight_RowClick(object sender, RowClickEventArgs e)
    {
      if (e.Clicks == 2 && e.Button == MouseButtons.Left && this.gviewRight.IsDataRow(e.RowHandle))
-        TryExecute(this.AddChannels);
+      {
+        if (this.rbInsertSwap.Checked)
+        {
+          TryExecute(this.SwapChannels);          
+        }
+        else
+          TryExecute(this.AddChannels);
+
+        // rows were re-arranged and the pending MouseDown event handler would focus+select the wrong row again
+        this.dontFocusClickedRow = true;
+      }
    }

    #endregion
@@ -2237,8 +2281,11 @@ namespace ChanSort.Ui
        return;
      try
      {
+        this.btnAdd.ImageIndex = this.rbInsertSwap.Checked ? 38 : this.rbInsertAfter.Checked ? 39 : 40;
+
        if (this.CurrentChannelList == null)
          return;
+
        var delta = this.curEditMode == EditMode.InsertAfter
          ? -1
          : this.rbInsertAfter.Checked ? +1 : 0;
@@ -2720,6 +2767,8 @@ namespace ChanSort.Ui
    // these 4 event handler in combination override the default row-selection and editor-opening 
    // behavior of the grid control.

+    private bool dontFocusClickedRow;
+
    private void gview_MouseDown(object sender, MouseEventArgs e)
    {
      var view = (GridView) sender;
@@ -2731,7 +2780,7 @@ namespace ChanSort.Ui
      {
        if (ModifierKeys == Keys.None)
        {
-          if (downHit.RowHandle != view.FocusedRowHandle)
+          if (downHit.RowHandle != view.FocusedRowHandle && !dontFocusClickedRow)
            SelectFocusedRow(view, downHit.RowHandle);
          this.timerEditDelay.Start();
        }
@@ -2748,6 +2797,7 @@ namespace ChanSort.Ui
      }

      this.dontOpenEditor = true;
+      this.dontFocusClickedRow = false;
    }

    private void gview_MouseUp(object sender, MouseEventArgs e)
--- a/source/ChanSort/MainForm.de.resx
+++ b/source/ChanSort/MainForm.de.resx
@@ -472,13 +472,13 @@ speziellen Anbieter, Satelliten oder Länderlisten aus.</value>
    <value>Excel liste exportieren...</value>
  </data>
  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
-    <value>Referenzliste speichern...</value>
+    <value>Vorlagedatei exportieren...</value>
  </data>
  <data name="miAddFromRefList.Caption" xml:space="preserve">
-    <value>Sender aus Referenzliste hinzufügen...</value>
+    <value>Vorlagedatei hinzufügen...</value>
  </data>
  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
-    <value>Referenzliste öffnen...</value>
+    <value>Reihenfolge aus Vorlage übernehmen...</value>
  </data>
  <data name="miSaveAs.Caption" xml:space="preserve">
    <value>Speichern &amp;unter...</value>
--- a/source/ChanSort/MainForm.resx
+++ b/source/ChanSort/MainForm.resx
@@ -125,9 +125,9 @@
  <data name="splitContainerControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 110</value>
  </data>
-  <metadata name="dsChannels.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="dsChannels.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>361, 17</value>
-  </metadata>
+  </data>
  <data name="gridLeft.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
  </data>
@@ -305,12 +305,12 @@
  <data name="&gt;&gt;lblHotkeyLeft.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
-  <metadata name="globalImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="globalImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>600, 17</value>
-  </metadata>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  </data>
+  <data name="$this.Localizable" type="System.Boolean, mscorlib">
    <value>True</value>
-  </metadata>
+  </data>
  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
    <value>6, 13</value>
  </data>
@@ -392,9 +392,9 @@
  <data name="rbInsertSwap.Location" type="System.Drawing.Point, System.Drawing">
    <value>256, 6</value>
  </data>
-  <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>475, 17</value>
-  </metadata>
+  </data>
  <data name="miFile.Caption" xml:space="preserve">
    <value>&amp;File</value>
  </data>
@@ -417,7 +417,7 @@
    <value>Save &amp;as...</value>
  </data>
  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
-    <value>Load reference list...</value>
+    <value>Apply order from a reference list...</value>
  </data>
  <data name="miAddFromRefList.Caption" xml:space="preserve">
    <value>Add channels from reference list...</value>
@@ -1230,36 +1230,6 @@
  <data name="&gt;&gt;colEncrypted.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;colChannelOrTransponder.Name" xml:space="preserve">
-    <value>colChannelOrTransponder</value>
-  </data>
-  <data name="&gt;&gt;colChannelOrTransponder.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;colFreqInMhz.Name" xml:space="preserve">
-    <value>colFreqInMhz</value>
-  </data>
-  <data name="&gt;&gt;colFreqInMhz.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;colServiceId.Name" xml:space="preserve">
-    <value>colServiceId</value>
-  </data>
-  <data name="&gt;&gt;colServiceId.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;colVideoPid.Name" xml:space="preserve">
-    <value>colVideoPid</value>
-  </data>
-  <data name="&gt;&gt;colVideoPid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;colAudioPid.Name" xml:space="preserve">
-    <value>colAudioPid</value>
-  </data>
-  <data name="&gt;&gt;colAudioPid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;colServiceType.Name" xml:space="preserve">
    <value>colServiceType</value>
  </data>
@@ -1272,6 +1242,18 @@
  <data name="&gt;&gt;colServiceTypeName.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;colFreqInMhz.Name" xml:space="preserve">
+    <value>colFreqInMhz</value>
+  </data>
+  <data name="&gt;&gt;colFreqInMhz.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;colChannelOrTransponder.Name" xml:space="preserve">
+    <value>colChannelOrTransponder</value>
+  </data>
+  <data name="&gt;&gt;colChannelOrTransponder.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;colSatellite.Name" xml:space="preserve">
    <value>colSatellite</value>
  </data>
@@ -1290,6 +1272,24 @@
  <data name="&gt;&gt;colTransportStreamId.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;colServiceId.Name" xml:space="preserve">
+    <value>colServiceId</value>
+  </data>
+  <data name="&gt;&gt;colServiceId.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;colVideoPid.Name" xml:space="preserve">
+    <value>colVideoPid</value>
+  </data>
+  <data name="&gt;&gt;colVideoPid.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;colAudioPid.Name" xml:space="preserve">
+    <value>colAudioPid</value>
+  </data>
+  <data name="&gt;&gt;colAudioPid.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;colSymbolRate.Name" xml:space="preserve">
    <value>colSymbolRate</value>
  </data>
@@ -1302,12 +1302,6 @@
  <data name="&gt;&gt;colPolarity.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;colUid.Name" xml:space="preserve">
-    <value>colUid</value>
-  </data>
-  <data name="&gt;&gt;colUid.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="&gt;&gt;colNetworkName.Name" xml:space="preserve">
    <value>colNetworkName</value>
  </data>
@@ -1326,10 +1320,10 @@
  <data name="&gt;&gt;colProvider.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;colDebug.Name" xml:space="preserve">
-    <value>colDebug</value>
+  <data name="&gt;&gt;colUid.Name" xml:space="preserve">
+    <value>colUid</value>
  </data>
-  <data name="&gt;&gt;colDebug.Type" xml:space="preserve">
+  <data name="&gt;&gt;colUid.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;colLogicalIndex.Name" xml:space="preserve">
@@ -1344,6 +1338,12 @@
  <data name="&gt;&gt;colSignalSource.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;colDebug.Name" xml:space="preserve">
+    <value>colDebug</value>
+  </data>
+  <data name="&gt;&gt;colDebug.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="&gt;&gt;barManager1.Name" xml:space="preserve">
    <value>barManager1</value>
  </data>
@@ -1843,7 +1843,7 @@
    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="SharedImageCollection.Timestamp" type="System.DateTime, mscorlib">
-    <value>05/05/2016 19:53:32</value>
+    <value>05/06/2016 20:31:55</value>
  </data>
  <data name="SharedImageCollection.ImageSize" type="System.Drawing.Size, System.Drawing">
    <value>16, 16</value>
@@ -2814,19 +2814,19 @@ specific provider, satellite or country lists.</value>
  <data name="&gt;&gt;splitContainerControl1.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <metadata name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="defaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>194, 17</value>
-  </metadata>
-  <metadata name="popupContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
+  <data name="popupContext.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>781, 17</value>
-  </metadata>
-  <metadata name="timerEditDelay.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
+  <data name="timerEditDelay.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>911, 17</value>
-  </metadata>
-  <metadata name="popupInputSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
+  <data name="popupInputSource.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>1042, 17</value>
-  </metadata>
-  <metadata name="popupFavList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  </data>
+  <data name="popupFavList.TrayLocation" type="System.Drawing.Point, System.Drawing">
    <value>1196, 17</value>
-  </metadata>
+  </data>
 </root>
--- a/source/ChanSort/Properties/Resources.Designer.cs
+++ b/source/ChanSort/Properties/Resources.Designer.cs
@@ -420,20 +420,20 @@ namespace ChanSort.Ui.Properties {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to ChanSort Reference List|*.csv|SamToolBox Reference List|*.chl|All Reference Lists|*.csv;*.chl.
+        ///   Looks up a localized string similar to To swap channels an equal number of rows must be selected in the left and right table..
        /// </summary>
-        internal static string MainForm_ShowOpenReferenceFileDialog_Filter {
+        internal static string MainForm_SwapChannels_RowCountMsg {
            get {
-                return ResourceManager.GetString("MainForm_ShowOpenReferenceFileDialog_Filter", resourceCulture);
+                return ResourceManager.GetString("MainForm_SwapChannels_RowCountMsg", resourceCulture);
            }
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Open Reference List.
+        ///   Looks up a localized string similar to Swap Channels.
        /// </summary>
-        internal static string MainForm_ShowOpenReferenceFileDialog_Title {
+        internal static string MainForm_SwapChannels_RowCountTitle {
            get {
-                return ResourceManager.GetString("MainForm_ShowOpenReferenceFileDialog_Title", resourceCulture);
+                return ResourceManager.GetString("MainForm_SwapChannels_RowCountTitle", resourceCulture);
            }
        }
        
@@ -508,6 +508,15 @@ namespace ChanSort.Ui.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized string similar to Select a reference list to import.
+        /// </summary>
+        internal static string ReferenceListForm_ShowOpenFileDialog_Title {
+            get {
+                return ResourceManager.GetString("ReferenceListForm_ShowOpenFileDialog_Title", resourceCulture);
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized string similar to New Version.
        /// </summary>
--- a/source/ChanSort/Properties/Resources.de.resx
+++ b/source/ChanSort/Properties/Resources.de.resx
@@ -204,12 +204,6 @@ Wollen Sie fortsetzen?</value>
    <value>Sie sind dabei die Sicherheitskopie wiederherzustellen. Sämtliche Änderungen gehen verloren!
 Möchten Sie fortfahren?</value>
  </data>
-  <data name="MainForm_ShowOpenReferenceFileDialog_Title" xml:space="preserve">
-    <value>Referenzliste öffnen</value>
-  </data>
-  <data name="MainForm_ShowOpenReferenceFileDialog_Filter" xml:space="preserve">
-    <value>ChanSort Referenzliste (*.csv)|*.csv|SamToolBox Referenzliste|*.chl|Alle Referenzlisten|*.csv;*.chl</value>
-  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="Donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\btn_donateCC_LG_de.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -289,4 +283,13 @@ Mögliche Ursachen sind USB-Sticks, die mit NTFS formatiert sind (FAT32 sollte i
  <data name="ReferenceListForm_btnApply_Click_Keep" xml:space="preserve">
    <value>Pr# beim bisherigen Sender belassen</value>
  </data>
+  <data name="MainForm_SwapChannels_RowCountMsg" xml:space="preserve">
+    <value>Zum Tauschen von Sendern muss die gleiche Anzahl an Zeilen in der linken und rechten Tabelle ausgewählt sein.</value>
+  </data>
+  <data name="MainForm_SwapChannels_RowCountTitle" xml:space="preserve">
+    <value>Sender Tauschen</value>
+  </data>
+  <data name="ReferenceListForm_ShowOpenFileDialog_Title" xml:space="preserve">
+    <value>Wählen Sie eine Vorlagedatei für die Senderreihenfolge</value>
+  </data>
 </root>
--- a/source/ChanSort/Properties/Resources.resx
+++ b/source/ChanSort/Properties/Resources.resx
@@ -199,12 +199,6 @@ Proceed?</value>
    <value>You are about to restore the backup file. All changes will be lost!
 Do you want to continue?</value>
  </data>
-  <data name="MainForm_ShowOpenReferenceFileDialog_Title" xml:space="preserve">
-    <value>Open Reference List</value>
-  </data>
-  <data name="MainForm_ShowOpenReferenceFileDialog_Filter" xml:space="preserve">
-    <value>ChanSort Reference List|*.csv|SamToolBox Reference List|*.chl|All Reference Lists|*.csv;*.chl</value>
-  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="Donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\btn_donateCC_LG.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -289,4 +283,13 @@ or firmware upgrades without running a new channel scan.
  <data name="ReferenceListForm_btnApply_Click_Keep" xml:space="preserve">
    <value>Keep current channel at the Pr#</value>
  </data>
+  <data name="MainForm_SwapChannels_RowCountMsg" xml:space="preserve">
+    <value>To swap channels an equal number of rows must be selected in the left and right table.</value>
+  </data>
+  <data name="MainForm_SwapChannels_RowCountTitle" xml:space="preserve">
+    <value>Swap Channels</value>
+  </data>
+  <data name="ReferenceListForm_ShowOpenFileDialog_Title" xml:space="preserve">
+    <value>Select a reference list to import</value>
+  </data>
 </root>
--- a/source/ChanSort/ReferenceListForm.cs
+++ b/source/ChanSort/ReferenceListForm.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -62,12 +63,13 @@ namespace ChanSort.Ui

        using (var dlg = new OpenFileDialog())
        {
-          dlg.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.MyComputer);
+          dlg.InitialDirectory = Path.Combine(Path.GetDirectoryName(Application.ExecutablePath) ?? ".", "ReferenceLists");
          dlg.AddExtension = true;
          dlg.Filter = filter + string.Format(Resources.MainForm_FileDialog_OpenFileFilter, supportedExtensions);
          dlg.FilterIndex = numberOfFilters + 1;
          dlg.CheckFileExists = true;
-          dlg.RestoreDirectory = true;
+          dlg.RestoreDirectory = false;
+          dlg.Title = Resources.ReferenceListForm_ShowOpenFileDialog_Title;
          if (dlg.ShowDialog(main) != DialogResult.OK)
            return null;

--- a/source/ChanSort/ReferenceListForm.de.resx
+++ b/source/ChanSort/ReferenceListForm.de.resx
@@ -122,13 +122,13 @@
    <value>70, 13</value>
  </data>
  <data name="labelControl1.Text" xml:space="preserve">
-    <value>Vorlagendatei:</value>
+    <value>Vorlagedatei:</value>
  </data>
  <data name="edFile.EditValue" xml:space="preserve">
    <value>← drücken Sie den Knopf um eine Datei auszuwählen</value>
  </data>
  <data name="labelControl2.Text" xml:space="preserve">
-    <value>Wählen Sie eine Vorlagendatei, aus der die Reihenfolge übernommen werden soll.
+    <value>Wählen Sie eine Vorlagedatei, aus der die Reihenfolge übernommen werden soll.
 Sie können eine der vordefinierten ChanSort-Listen wählen (TXT, CHL, CSV)
 oder eine Senderdatei eines anderen Fernsehers (SCM, TLL, DB, BIN, ...)</value>
  </data>
@@ -148,7 +148,7 @@ oder eine Senderdatei eines anderen Fernsehers (SCM, TLL, DB, BIN, ...)</value>
    <value>65, 13</value>
  </data>
  <data name="labelControl3.Text" xml:space="preserve">
-    <value>Vorlagenliste:</value>
+    <value>Vorlageliste:</value>
  </data>
  <data name="labelControl4.Size" type="System.Drawing.Size, System.Drawing">
    <value>39, 13</value>
@@ -220,14 +220,14 @@ oder eine Senderdatei eines anderen Fernsehers (SCM, TLL, DB, BIN, ...)</value>
    <value>ChanSort Wiki mit weiteren Informationen und Vorlagen-Downloads öffnen</value>
  </data>
  <data name="groupControl1.Text" xml:space="preserve">
-    <value>1. Wählen Sie eine Vorlagen-Datei</value>
+    <value>1. Wählen Sie eine Vorlage-Datei</value>
  </data>
  <data name="labelControl10.Text" xml:space="preserve">
-    <value>Wenn die TV- und Vorlagendatei mehrere Listen enthalten oder unterschiedlich strukturiert sind, können Sie bestimmte Teile neu ordnen.
+    <value>Wenn die TV- und Vorlagedatei mehrere Listen enthalten oder unterschiedlich strukturiert sind, können Sie bestimmte Teile neu ordnen.
 Dieser Schritt kann je nach Bedarf wiederholt werden.</value>
  </data>
  <data name="labelControl8.Text" xml:space="preserve">
-    <value>Diese Option steht nur zur Verfügung, wenn TV- und Vorlagendatei gleich strukturiert sind.
+    <value>Diese Option steht nur zur Verfügung, wenn TV- und Vorlagedatei gleich strukturiert sind.
 (d.h. gleiche Teil-Listen für Antenne/Kabel/Sat, TV/Radio, Analog/Digital)</value>
  </data>
  <data name="groupControl2.Text" xml:space="preserve">
--- a/source/ChanSort/ReferenceLists/at_astra192E_orf-freehd.txt
+++ b/source/ChanSort/ReferenceLists/at_astra192E_orf-freehd.txt
--- a/source/ChanSort/ReferenceLists/at_liwest.txt
+++ b/source/ChanSort/ReferenceLists/at_liwest.txt
@@ -0,0 +1,489 @@
+1;ORF1 HD;333-1118-13001
+2;ORF2O HD;333-1118-13006
+3;ATV HD;333-1118-13012
+4;PULS 4 Austria;1-11118-20007
+5;LT 1;1-11125-250
+6;Das Erste HD;333-1101-28106
+7;ZDF HD;333-1079-28006
+8;SAT.1 A;1-11118-20005
+9;RTL Austria;333-10400-12003
+10;Kabel 1 Austria;1-11118-20004
+11;ProSieben Austria;1-11118-20002
+12;VOX Austria;333-10400-12060
+13;SUPER RTL A;333-10400-12040
+14;RTL2 Austria;333-10400-12020
+15;Disney Channel;333-10600-1793
+16;Nickelodeon AT;1-11125-61
+17;ServusTV HD Oesterreich;222-32000-4913
+18;KiKA HD;333-1079-28008
+19;RTLNITRO;333-1073-31200
+20;SPORT1;333-10500-900
+21;3sat HD;333-1079-28007
+22;SRF 1 HD;333-10600-901
+23;DMAX Austria;222-28000-10101
+24;ProSieben MAXX Austria;1-11118-17505
+25;Sat 1 Gold Austria;222-31000-5310
+28;ATV 2;222-28000-13223
+29;ORF Sport + HD;333-10600-100
+30;sixx Austria;333-10900-13106
+31;ORF III HD;333-10900-13101
+32;Infokanal Liwest;333-10400-2400
+33;dorftv.;222-31000-7712
+34;WT 1;222-39000-17
+35;Test;222-39000-31
+36;KremstalDirekt;222-39000-20
+37;BTV OÖ;222-39000-29
+38;Muehlviertel.TV;222-39000-2
+39;MTW;222-39000-21
+40;BTV;222-39000-88
+41;RTV;222-39000-20030
+42;LL TV;222-39000-20031
+43;Infokanal ASAK;222-39000-370
+44;Info TV;222-39000-32
+45;Austria 24;222-39000-317
+46;Test;222-39000-318
+47;HITRADIO OE3;1-11125-13013
+48;TRACE TV;1-1011-5105
+49;DELUXE MUSIC;222-28000-10100
+50;Comedy Central / VIVA AT;222-30000-28676
+51;gotv;333-10900-13102
+52;Tele 5;1-11118-51
+55;n-tv;333-10400-12090
+56;N24;333-10500-17503
+57;DW Europa;333-10400-607
+58;CNN Int.;333-10700-28522
+59;BBC World;222-32000-10050
+60;Bloomberg;1-11125-10067
+61;EuroNews;333-1073-31220
+62;France 24 (en Francais);333-1093-13849
+64;F.O. TV;1-11125-13502
+65;arte HD;222-29000-28724
+66;ARD-alpha;333-1093-28487
+67;PHOENIX HD;222-29000-28725
+68;tagesschau24 HD;222-29000-28721
+69;Einsfestival HD;222-29000-28722
+70;EinsPlus HD;222-29000-28723
+71;ZDFinfo HD;333-1079-28011
+72;zdf.kultur HD;333-1079-28016
+73;zdf_neo HD;333-1079-28014
+74;K-TV;333-11000-12601
+75;Bibel TV;222-28000-12122
+76;BBC Entertainment Europa;333-10500-611
+77;RIC;1-11118-13019
+78;Melodie TV;1-11118-13229
+80;ANIXE HD;222-32000-61202
+81;QVC  HD;222-28000-12100
+82;HSE24;333-10500-40
+83;Sonnenklar TV;333-10500-32
+90;ORF2N HD;333-1118-13004
+91;ORF2S HD;333-1118-13007
+99;SRF zwei HD;333-10600-907
+100;BR Süd HD;333-1101-28110
+101;WDR HD Köln;333-1101-28111
+102;hr-fernsehen HD;333-1101-28108
+103;MDR Sachsen HD;333-1073-28228
+104;rbb Brandenburg HD;333-1073-28205
+105;SR Fernsehen;333-1093-28486
+106;SWR BW HD;333-1101-28113
+107;NDR FS NDS HD;333-1073-28224
+200;MTV ROCKS;333-10700-28659
+201;VH1 Classic;333-10700-28657
+202;VH1;333-10700-28656
+203;MTV Dance;333-10700-28655
+204;MTV Hits;333-10700-28654
+205;MTV Music 24;222-31000-28671
+206;MTV HD;222-30000-28681
+210;auto motor und sport channel;333-10700-13205
+211;sportdigital;333-1093-13109
+213;Nautical Channel HD;222-31000-8607
+214;Extrem EMEA;222-28000-3
+215;MotorsTV HD INTER;222-30000-7301
+220;National Geographic HD;222-26000-20107
+221;The History Channel;222-26000-20118
+222;A&E HD;222-26000-20121
+230;Cartoon Network;222-26000-20120
+231;Boomerang;222-26000-20113
+232;Nicktoons (S);222-30000-28682
+233;duck TV;333-10900-20350
+234;Fix & Foxi;222-26000-20201
+240;TNT Film;222-26000-20119
+241;Kinowelt TV;333-11000-2950
+250;Romance TV;222-26000-63
+251;Gute Laune TV;222-32000-50111
+252;ANIMAX;222-26000-1847
+253;Travel Channel;1-1011-619
+254;Discovery Channel HD;222-26000-20211
+255;Animal Planet HD;333-10500-12
+256;E! Entertainment;222-26000-20205
+300;Test;333-1118-10
+301;Lust Pur;222-28000-70
+302;Reality EMEA;222-28000-2
+303;Hustler TV;333-1118-9
+304;Dorcel TV;222-29000-13900
+305;PRIVATE TV;333-10900-14223
+306;Redlight 3D-HD;1-11118-16932
+307;Dusk! TV;333-10900-14220
+350;Sky Sport Austria;133-2-30
+351;Sky Sport 1;133-4-221
+352;Sky Sport 2;133-2-222
+353;Sky Sport 3;133-3-263
+354;Sky Sport 4;133-3-273
+355;Sky Sport 5;133-3-283
+356;Sky Sport 6;133-3-293
+357;Sky Sport 7;133-3-303
+358;Sky Sport 8;133-2-313
+359;Sky Sport 9;133-2-323
+360;Sky Sport 10;133-2-333
+361;Sky Sport 11;133-3-253
+363;Sky Buli 1;133-4-223
+364;Sky Buli 2;133-3-262
+365;Sky Buli 3;133-3-272
+366;Sky Buli 4;133-3-282
+367;Sky Buli 5;133-3-292
+368;Sky Buli 6;133-3-302
+369;Sky Buli 7;133-2-312
+370;Sky Buli 8;133-2-322
+371;Sky Buli 9;133-2-332
+372;Sky Buli 10;133-3-252
+374;Sky Sport Austria HD;133-9-143
+375;Sport 1+ HD;133-11-122
+376;Sport1 US HD;133-10-119
+377;Eurosport  2 HD;133-9-109
+378;Sky Sport HD 1;133-6-129
+379;Sky Sport HD 2;133-13-114
+380;Sky Sport HD 3;133-6-268
+381;Sky Sport HD 4;133-13-278
+382;Sky Sport HD 5;133-12-288
+383;Sky Sport HD 6;133-11-298
+384;Sky Sport HD 7;133-10-308
+385;Sky Sport HD 8;133-14-318
+386;Sky Sport HD 9;133-14-328
+387;Sky Sport HD 10;133-10-338
+388;Sky Sport HD 11;133-14-258
+390;Sky Buli HD 1;133-12-105
+391;Sky Buli HD 2;133-6-267
+392;Sky Buli HD 3;133-13-277
+393;Sky Buli HD 4;133-12-287
+394;Sky Buli HD 5;133-11-297
+395;Sky Buli HD 6;133-10-307
+396;Sky Buli HD 7;133-14-317
+397;Sky Buli HD 8;133-14-327
+398;Sky Buli HD 9;133-10-337
+399;Sky Buli HD 10;133-14-257
+400;Sky Sport News;133-4-17
+401;Motorvision TV;133-2-168
+402;Sky Krimi;133-4-23
+403;13th Street;133-2-42
+404;RTL Crime;133-4-27
+405;RTL Passion;133-4-29
+406;Fox Serie;133-2-16
+407;TNT Serie;133-2-50
+408;Syfy;133-2-36
+409;Beate-Uhse.TV;133-3-21
+410;Goldstar TV;133-2-518
+411;Heimatkanal;133-2-22
+412;Jukebox;133-4-401
+413;Classica;133-3-24
+414;Disney XD;133-3-28
+415;Disney Junior;133-3-26
+416;Junior;133-3-19
+417;Discovery Channel;133-4-14
+418;NatGeo Wild;133-2-12
+419;Spiegel Geschichte;133-2-52
+420;National Geographic;133-4-13
+430;Sky Sport News HD;133-12-108
+431;Eurosport 1 HD;133-11-132
+432;13th Street HD;133-13-127
+433;RTL Crime HD;133-9-140
+434;Fox HD;133-10-124
+435;TNT Serie HD;133-11-123
+436;SyFy HD;133-12-126
+437;Disney Junior HD;133-8-138
+438;Nat Geo HD;133-13-112
+439;NatGeoWild HD;133-6-118
+440;Discovery HD;133-6-130
+441;Spiegel Geschichte HD;133-8-137
+442;History HD;133-11-113
+443;AXN HD;133-10-125
+444;TNT Glitz HD;133-14-136
+445;E! Entertainm. HD;133-14-128
+446;Universal HD;133-14-101
+447;Sky Atlantic;133-4-34
+448;Sky Atlantic HD;133-13-110
+449;Sky Atlantic + 1 HD;133-8-144
+455;Sky Cinema;133-4-10
+456;Sky Cinema +1;133-3-11
+457;Sky Cinema +24;133-3-43
+458;Sky Action;133-3-9
+459;Sky Comedy;133-3-8
+460;Sky Emotion;133-4-20
+461;Sky Nostalgie;133-4-516
+462;Sky Hits;133-2-41
+463;MGM;133-4-515
+464;Disney Cinematic;133-2-25
+465;Sky Kinowelt TV;133-4-406
+466;Sky TNT Film (TCM);133-6-405
+470;Sky Cinema HD;133-6-131
+471;Sky Cinema+1 HD;133-8-134
+472;Sky Cinema+24 HD;133-8-135
+473;Sky Action HD;133-11-116
+474;Sky Hits HD;133-12-107
+475;MGM HD;133-12-115
+476;Disney Cinematic HD;133-13-111
+499;Rai Sport 1;1-11125-3305
+500;RAI1;333-10700-3401
+501;TV5MONDE EUROPE;222-32000-10060
+502;RTK-SAT;333-11000-8
+503;TRT TURK;222-31000-9
+504;KANAL 7 AVRUPA;333-10500-4
+505;RTS SAT;333-10400-14228
+507;Duna HD;333-10600-20002
+508;Pro TV International;333-10600-4701
+509;CCTV NEWS;333-10600-6914
+520;KRAL TV;333-11000-2
+521;EUROSTAR;333-11000-6
+522;CNN TÜRK;333-11000-1
+523;EURO D;333-11000-3
+524;atv avrupa;333-11000-5
+525;SHOW TURK;333-11000-7
+526;FB TV;222-30000-5
+527;TV 8 INT;222-30000-7
+528;TRT HABER;222-31000-4821
+529;TRT 3-SPOR;222-31000-4822
+530;TRT COCUK;222-31000-4823
+531;HAYAT TV;222-30000-5729
+532;YOLTV;222-30000-5726
+533;BARIS TV;222-30000-5718
+534;TRT 1;222-30000-35
+540;CT 24;333-10500-8006
+550;HRT-TV1;333-10900-8301
+551;HRT-TV2;333-10900-8302
+552;HRT-TV3;333-10900-8303
+555;DM SAT;222-31000-7722
+556;TVSH-SAT;222-31000-7723
+600;HAYAT PLUS;333-10700-1
+601;Pink Extra;333-10400-2
+602;Pink Plus;333-10400-1
+603;Pink Music;333-10400-10
+616;Dubai TV;333-1073-9501
+617;TVE Internacional;333-10700-13710
+618;RTPi;222-30000-4603
+619;RTR Planeta;333-11000-2550
+620;Channel One Russia;333-11000-2850
+621;TV Polonia;333-10700-1500
+625;BN SAT Evropa...;222-30000-11033
+626;BN MUSIC;222-30000-2
+901;;0-0-0
+902;;0-0-0
+903;;0-0-0
+904;;0-0-0
+905;;0-0-0
+906;;0-0-0
+907;;0-0-0
+908;;0-0-0
+909;;0-0-0
+910;;0-0-0
+911;;0-0-0
+912;;0-0-0
+913;;0-0-0
+914;;0-0-0
+915;;0-0-0
+916;;0-0-0
+917;;0-0-0
+918;;0-0-0
+919;;0-0-0
+920;;0-0-0
+921;;0-0-0
+922;;0-0-0
+923;;0-0-0
+924;;0-0-0
+925;;0-0-0
+926;;0-0-0
+927;;0-0-0
+944;PULS 4 HD Austria;222-1031-5303
+945;ProSieben HD Austria;222-1031-5301
+946;SAT.1 HD Austria;222-1031-5300
+947;kabel eins HD Austria;222-1031-5302
+948;RTL II HD Austria;222-1041-11941
+949;VOX HD Austria;222-1041-11921
+950;RTL HD Austria;222-1041-11911
+951;Tele 5 HD;333-1073-232
+952;DMAX HD;1-11125-231
+953;VIVA/Comedy Central HD;1-11125-419
+955;Nickelodeon HD;222-1041-233
+956;Disney Channel HD;222-1041-420
+957;Deluxe Music HD;222-1041-418
+971;tageschau24;1-1011-28721
+972;EinsPlus;1-1011-28723
+973;Bayerisches FS Süd;222-40000-28107
+974;WDR Köln;222-44000-28111
+975;hr-fernsehen;222-40000-28108
+976;MDR Sachsen;1-1201-28228
+977;rbb Brandenburg;1-1201-28205
+979;SWR Fernsehen BW;222-40000-28113
+980;NDR FS MV;1-1201-28224
+981;ORF 2 S;222-32000-13007
+982;ORF 2 N;222-32000-13004
+983;ATV;333-10500-51
+984;zdf_neo;222-44000-11130
+985;zdf.kultur;222-44000-11140
+986;ZDFinfo;222-40000-11170
+987;PHOENIX;1-1011-10331
+988;3sat;222-40000-11150
+989;KiKA;222-40000-11160
+991;EinsFestival;1-1201-28396
+994;arte;1-1011-11120
+995;ZDF;222-44000-11110
+996;Das Erste;1-1011-11100
+997;ORF E;1-11118-13014
+998;ORF2 O;222-32000-4912
+999;ORF eins;1-11125-61920
+1701;OE1;333-1118-13121
+1702;OE2 O;333-1118-13126
+1703;OE3;333-1118-13133
+1704;FM4;333-1118-13134
+1705;Life Radio;1-11125-33
+1706;Radio Arabella;222-28000-19
+1707;Krone Hit;1-11125-34
+1708;Welle 1;222-28000-18
+1709;LoungeFM;1-11125-311
+1710;Radio Fro;1-11125-35
+1711;Radio Maria;222-28000-13140
+1712;OE1 DD;333-1118-13122
+1713;OE2 W;333-1118-13123
+1714;OE2 N;333-1118-13124
+1715;OE2 B;333-1118-13125
+1716;OE2 S;333-1118-13127
+1717;OE2 T;333-1118-13128
+1718;OE2 V;333-1118-13129
+1719;OE2 St;333-1118-13130
+1720;OE2 K;333-1118-13131
+1721;ANTENNE BAYERN;222-28000-170
+1722;Bayern 1;333-1093-28400
+1723;Bayern 2;333-1093-28401
+1724;BAYERN 3;333-1093-28402
+1725;BR-KLASSIK;333-1093-28403
+1726;B5 aktuell;333-1093-28404
+1727;BAYERN plus;333-1093-28405
+1728;PULS;333-1093-28406
+1729;hr1;333-1093-28419
+1730;hr2;333-1093-28420
+1731;hr3;333-1093-28421
+1732;hr4;333-1093-28422
+1733;hr-iNFO;333-1093-28424
+1734;MDR1 SACHSEN;333-1093-28428
+1735;MDR1 SA-ANHALT;333-1093-28429
+1736;MDR1 THÜRINGEN;333-1093-28430
+1737;MDR FIGARO;333-1093-28431
+1738;JUMP;333-1093-28432
+1739;MDR SPUTNIK;333-1093-28433
+1740;MDR INFO;333-1093-28434
+1741;MDR KLASSIK;333-1093-28435
+1742;NDR 2;333-1093-28437
+1743;NDR Kultur;333-1093-28438
+1744;NDR Info;333-1093-28439
+1745;NDR 90,3;333-1093-28441
+1746;NDR1WelleNord;333-1093-28442
+1747;NDR 1 Radio MV;333-1093-28443
+1748;NDR 1 Nieders.;333-1093-28444
+1749;NDR Info Spez.;333-1093-28445
+1750;Bremen Eins;333-1093-28448
+1751;Nordwestradio;333-1093-28449
+1752;Bremen Vier;333-1093-28450
+1753;Inforadio;333-1093-28452
+1754;Kulturradio;333-1093-28453
+1755;Antenne Brandenburg;333-1093-28454
+1756;radioBERLIN 88,8;333-1093-28455
+1757;radioeins;333-1093-28456
+1758;SWR 1 BW;333-1093-28465
+1759;SWR 1 RP;333-1093-28466
+1760;SWR 2;333-1093-28467
+1761;SWR 3;333-1093-28468
+1762;SWR 4 BW;333-1093-28469
+1763;SWR 4 RP;333-1093-28470
+1764;DASDING;333-1093-28471
+1765;WDR 2;333-1093-28476
+1766;WDR 3;333-1093-28477
+1767;WDR 4;333-1093-28478
+1768;WDR 5;333-1093-28479
+1769;WDR Funkhaus Europa;333-1093-28480
+1770;WDR Event;333-1093-28483
+1771;DKULTUR;222-28000-28012
+1772;DLF;222-28000-28013
+1773;KIRAKA;333-1093-28482
+1774;1LIVE;333-1093-28475
+1775;DRadioWissen;222-28000-28017
+1776;YOU FM;333-1093-28423
+1777;N-JOY;333-1093-28440
+1778;Fritz;333-1093-28457
+1779;SR1 Europawelle;333-1093-28461
+1780;SR2 KulturRadio;333-1093-28462
+1781;SR3 Saarlandwelle;333-1093-28463
+1782;SWRinfo;333-1093-28472
+1783;1LIVE diggi;333-1093-28481
+1784;sunshine live;222-28000-169
+1785;BBCW SERVICE;222-32000-8565
+1786;CNN TÜRK RADYO;333-11000-11
+1787;RADYO 1;222-31000-5750
+1788;RADYO 3;222-31000-5752
+1789;RADYO 4;222-31000-5753
+1790;TRT FM;222-31000-5751
+1791;KRAL FM;333-11000-4
+1792;HRT-HR1;333-10900-8305
+1793;HRT-HR2;333-10900-8306
+1794;HRT-HR3;333-10900-8307
+1795;RADIO MARIJA;333-10600-8379
+1796;Radio Beograd;333-10400-14229
+1797;Radio Horeb;1-11125-7289
+1798;Radio Pink;333-10400-3
+1799;Arabella Rock;1-11125-4060
+1800;UK Chart Toppers Stingray;333-10900-4001
+1801;Rock Anthems Stingray;333-10900-4002
+1802;Drive Stingray;333-10900-4003
+1803;Rock Alternative Stingray;333-10900-4004
+1804;Headbangers Stingray;333-10900-4005
+1805;60s Stingray;333-10900-4006
+1806;70s Stingray;333-10900-4007
+1807;Dancefloor Fillers Stingray;333-10900-4008
+1808;Breaks & Beats Stingray;333-10900-4009
+1809;Urban Stingray;333-10900-4010
+1811;Reggae Stingray;333-10900-4012
+1812;World Carnival Stingray;333-10900-4013
+1813;Jazz Classics Stingray;333-10900-4014
+1814;Cool Jazz Stingray;333-10900-4015
+1815;Chillout Stingray;333-10900-4016
+1816;Hot Country Stingray;333-10900-4017
+1817;Indie Classics Stingray;333-10900-4018
+1818;Blues Stingray;333-10900-4019
+1819;Classical Greats Stingray;333-10900-4020
+1820;Classical Orchestral Stingray;333-10900-4021
+1821;Classical Calm Stingray;333-10900-4022
+1822;80s Stingray;333-10900-4023
+1823;90s Stingray;333-10900-4024
+1824;Silk (Love Songs) Stingray;333-10900-4025
+1825;Freedom Stingray;333-10900-4026
+1826;Cocktail Lounge Stingray;333-10900-4028
+1827;All Day Party Stingray;333-10900-4029
+1828;Total Hits - Germany Stingray;333-10900-4031
+1829;Schlager Stingray;333-10900-4032
+1830;Kids Stingray;333-11000-4033
+1831;Groove Stingray;333-11000-4034
+1832;Revival 60s&70s Stingray;333-11000-4035
+1833;Volksmusik Stingray;333-11000-4036
+1834;Total Hits Italy Stingray;333-11000-4038
+1835;Türk Müzigi Stingray;333-11000-4039
+1836;Total Hits Nordic Stingray;333-10600-4040
+1837;Apres Ski Stingray;333-10600-4041
+1838;Classic Rock Stingray;333-10600-4042
+1839;Rock`n` Roll;333-10600-4043
+1840;Arabic Stingray;333-10700-4044
+1841;Bollywood Hits Stingray;333-10700-4045
+1842;New Age Stingray;333-10700-4046
+1843;Total Hits Austria Stingray;333-10700-4047
+1844;The Alternative (Germany) Stingray;333-10700-4048
+1845;Hip Hop Stingray;333-10700-4049
+1846;Rewind 80s & 90s Stingray;333-10700-4050
+1847;Chansons Stingray;333-10700-4051
+1848;Freies Radio Salzkammergut;333-1073-1951
+1849;harmony.fm;333-1073-1952
+1850;Antenne Salzburg;333-1073-1953
--- a/source/ChanSort/ReferenceLists/de_astra192E_hisense_freehd.txt
+++ b/source/ChanSort/ReferenceLists/de_astra192E_hisense_freehd.txt
--- a/source/ChanSort/ReferenceLists/de_astra192E_hisense_hdplus.txt
+++ b/source/ChanSort/ReferenceLists/de_astra192E_hisense_hdplus.txt