- improved swapping of channels by double clicking

- improved adding of channels (when they already have a new channel number) - added predefined reference lists
2026-01-16 20:32:04 +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.sln
+++ b/source/ChanSort.sln
@@ -45,8 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Hisense", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Samsung", "Test.Loader.Samsung\Test.Loader.Samsung.csproj", "{1ED68A9B-6698-4609-B9E6-8E08B6055F2E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReferenceLists", "ReferenceLists", "{382AB628-3B89-4966-8D89-36BED9F1F836}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -209,7 +207,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{382AB628-3B89-4966-8D89-36BED9F1F836} = {67AED502-8AEB-45F2-9B95-AC42B6A5D2C4}
-	EndGlobalSection
 EndGlobal
--- 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 @@
        +rwvuOZ5Rrz6KVedT4hVPObS0Vmu1z/HpT4oBt6qChs377ESjrPc1MUXf4zP3laWPBEWXSEWnH4+VHh5
        f7yGd2XVLNU081BuCnNFEaUqInEDKxrGuhAi1+jHbKjHrHVjnDqJXuVEqzxBpvwY6SOH0TxnWFVLigFd
        Vcn19JLt6sLo6MBoa0NvbkYPh0kHg+wFAuw2NJCqq2OntpZdt5tPJfsCaUVhV9qRNgu+S9+kVWlZSkpL
-        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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
@@ -17,366 +17,366 @@
 17;TELE 5;133-33-51
 18;RTL NITRO A;1-1115-13102
 19;TLC;133-5-772
-20;ORF III;1-1115-13101
-21;3sat HD;1-1010-11150
-22;arte HD;1-1019-10302
-23;DMAX Austria;133-7-73
-24;Welt der Wunder;1-1115-13103
-25;PHOENIX HD;1-1025-10331
-26;ANIXE HD;1-1053-21100
-27;KiKA HD;1-1010-11160
-28;Disney Channel;133-5-1793
-29;NICKELODEON AT;133-7-61
-30;Das Erste HD;1-1019-10301
-31;ARD-alpha;1-1093-28487
-32;BR Fernsehen Süd HD;1-1025-10325
-33;SWR BW HD;1-1019-10303
-34;hr-fernsehen HD;1-1061-10355
-35;WDR HD Köln;1-1201-28325
-36;MDR Sachsen HD;1-1061-10352
-37;rbb Berlin HD;1-1061-10351
-38;NDR FS NDS HD;1-1025-10327
-39;EinsPlus HD;1-1039-10377
-40;Einsfestival HD;1-1039-10376
-41;tagesschau24 HD;1-1039-10375
-45;RiC;1-1117-13019
-46;Family TV;133-15-33
-50;ZDF HD;1-1011-11110
-51;zdf_neo HD;1-1011-11130
-52;zdf.kultur HD;1-1011-11140
-53;ZDFinfo HD;1-1010-11170
-55;LT1-OOE;1-1115-13104
-56;BTV;1-1115-13141
-57;R9 Oesterreich HD;1-1005-13312
-58;Schau TV;1-1003-13225
-60;n-tv;1-1089-12090
-61;N24 Austria;133-7-53
-62;EuroNews;1-1091-31220
-63;BBC World News Europe HD;1-1002-5001
-64;NHK World TV;1-1002-5021
-65;Insight HD;1-1002-5010
-66;CNN Int.;1-1028-4422
-67;DW;1-1028-4430
-68;CNBC Europe;1-1026-10030
-69;Bloomberg Europe TV;1-1026-10067
-70;gotv;1-1117-13021
-71;HITRADIO OE3;1-1117-13013
-72;DELUXE MUSIC;133-7-65
-73;Comedy Central / VIVA AT;133-7-60
-74;Folx TV;1-1117-13018
-75;nice;1-1113-12634
-76;Deutsches Musik Fernsehen;1-1113-12604
-77;MELODIE TV;1-1003-13229
-78;Volksmusik;1-1003-13222
-79;Starparadies AT;1-1003-13226
-80;Mei Musi TV;1-1117-13015
-85;ORF SPORT+ HD;1-1005-13309
-86;Eurosport 1 Deutschland;1-1091-31200
-87;SPORT1;133-33-900
-90;Insight UHD;1-1097-2000
-91;Fashion 4K;1-1043-12510
-92;Fashion 4K Preview;1-1043-12501
-93;SES UHD Demo Channel;1-1035-1
-94;Canal+ UHD;1-1110-1001
-95;PEARL TV 4K UHD;1-1097-2010
-96;ASTRA 3D demo;1-1027-5101
-100;1-2-3.tv HD;1-1055-5502
-101;HSE24 HD;1-1053-21104
-102;HSE24 EXTRA HD;1-1055-5501
-103;HSE24 TREND;133-33-77
-104;QVC HD;1-1053-21103
-105;QVC PLUS HD;1-1055-5504
-106;QVC BEAUTY & STYLE HD;1-1033-10105
-107;MediaShop- Meine Einkaufswelt;133-7-775
-108;MediaShop- Neuheiten;133-33-898
-109;mediaspar HD;1-1033-10102
-110;meinTVshop;133-33-899
-111;Channel21 HD;1-1033-10104
-112;pearl.tv HD Shop;1-1109-5404
-113;Shop24Direct;1-1113-12633
-114;TV Shop;1-1109-5412
-115;Sparhandy TV;133-5-659
-116;Livington TV;133-5-74
-117;Juwelo HD;1-1109-5403
-118;Beauty TV;133-7-54
-119;Aristo.TV;1-1005-13311
-120;Genius Plus;1-1053-21113
-121;e8 television;133-33-897
-122;JML Shop;133-7-514
-123;sonnenklar.TV HD;1-1109-5400
-130;Bibel TV HD;1-1003-13224
-131;HOPE Channel HD;1-1003-13227
-132;SOPHIA TV;1-1053-21112
-133;EWTN katholisches TV;133-5-62
-134;K-TV;1-1113-12601
-135;Die Neue Zeit TV;1-1015-4713
-136;GOD Channel;133-7-774
-137;Sonlife Broadcasting Network;1-1026-10080
-138;AstroTV;133-33-661
+20;RiC;1-1117-13019
+30;ORF III;1-1115-13101
+31;3sat HD;1-1010-11150
+32;arte HD;1-1019-10302
+33;PHOENIX HD;1-1025-10331
+40;DMAX Austria;133-7-73
+41;Welt der Wunder;1-1115-13103
+50;KiKA HD;1-1010-11160
+51;ANIXE HD;1-1053-21100
+52;Disney Channel;133-5-1793
+53;NICKELODEON AT;133-7-61
+54;Family TV;133-15-33
+90;LT1-OOE;1-1115-13104
+91;BTV;1-1115-13141
+92;R9 Oesterreich HD;1-1005-13312
+93;Schau TV;1-1003-13225
+100;Das Erste HD;1-1019-10301
+101;ARD-alpha;1-1093-28487
+102;BR Fernsehen Süd HD;1-1025-10325
+103;SWR BW HD;1-1019-10303
+104;hr-fernsehen HD;1-1061-10355
+105;WDR HD Köln;1-1201-28325
+106;MDR Sachsen HD;1-1061-10352
+107;rbb Berlin HD;1-1061-10351
+108;NDR FS NDS HD;1-1025-10327
+109;EinsPlus HD;1-1039-10377
+110;Einsfestival HD;1-1039-10376
+200;ZDF HD;1-1011-11110
+201;zdf_neo HD;1-1011-11130
+202;zdf.kultur HD;1-1011-11140
+203;ZDFinfo HD;1-1010-11170
+210;münchen.tv;1-1021-4604
+211;rfo Regional Oberbayern;1-1021-4605
+212;Niederbayern;1-1021-4609
+213;TVA-OTV;1-1021-4608
+214;intv;1-1021-4602
+215;a.tv;1-1021-4600
+216;Franken Fernsehen;1-1021-4601
+217;TV Oberfranken;1-1021-4607
+218;Mainfranken;1-1021-4606
+219;Ulm-Allgäu;1-1021-4603
+220;REGIO TV;133-33-47
+221;L-TV/TVM;1-1115-13113
+222;rhein main tv;1-1113-12614
+223;BB-MV Lokal-TV;133-7-70
+224;Lokal TV Portal;1-1021-4690
+300;ORF SPORT+ HD;1-1005-13309
+301;Eurosport 1 Deutschland;1-1091-31200
+302;SPORT1;133-33-900
+400;tagesschau24 HD;1-1039-10375
+401;n-tv;1-1089-12090
+402;N24 Austria;133-7-53
+403;EuroNews;1-1091-31220
+404;BBC World News Europe HD;1-1002-5001
+405;NHK World TV;1-1002-5021
+406;Insight HD;1-1002-5010
+407;CNN Int.;1-1028-4422
+408;Sky News Intl;1-1111-7290
+409;DW;1-1028-4430
+410;CNBC Europe;1-1026-10030
+411;Bloomberg Europe TV;1-1026-10067
+412;France 24 (in English);1-1022-6906
+413;Al Jazeera English;1-1028-4440
+414;RT HD;1-1012-6381
+415;CCTV NEWS;1-1022-6914
+416;CCTV9 Documentary;1-1022-6912
+417;Arirang TV;1-1020-7011
+430;TV5 MONDE;1-1086-9910
+431;LCI;1-1090-9009
+432;BFM BUSINESS;1-1074-8303
+433;France 24 (en Français);1-1022-6905
+434;I24 NEWS;1-1040-31307
+435;CCTV F;1-1022-6913
+436;M6 BOUTIQUE LA CHAINE;1-1026-10063
+437;INFO TNTSAT;1-1108-12150
+440;BVN TV;1-1048-4320
+441;Infokanaal TVV;53-1119-12810
+445;TV TRWAM;1-1048-4310
+450;RAI News 24;1-1006-4216
+453;STN test 1;1-1045-31501
+455;TWOJ;1-1027-5601
+460;TVE INTERNACIONAL EUROPA;1-1028-4401
+461;CANAL 24 HORAS;1-1028-4402
+462;CANAL SUR A.;1-1046-30505
+463;TVGA;1-1040-31306
+464;ARAGON TV;1-1032-30205
+465;LTC;1-1052-29853
+466;RT Esp HD;1-1012-6382
+467;TBN Espana;1-1040-31305
+468;TELESUR;1-1040-31304
+469;Cubavision Internacional;1-1020-7008
+470;TV Record SD;1-1040-31301
+471;YOMVI;1-1032-30203
+472;PORTADA;1-1058-30150
+473;RADIOS;1-1058-30102
+480;TRT Turk;1-1027-5113
+490;DW (Arabia 2);1-1028-4435
+491;Al Jazeera Channel;1-1020-7009
+492;France 24 (in Arabic);1-1022-6910
+493;Canal Algerie;1-1026-10083
+494;Algerie 3;1-1026-10082
+600;gotv;1-1117-13021
+601;HITRADIO OE3;1-1117-13013
+602;DELUXE MUSIC;133-7-65
+603;nice;1-1113-12634
+604;Comedy Central / VIVA AT;133-7-60
+605;Folx TV;1-1117-13018
+606;Deutsches Musik Fernsehen;1-1113-12604
+607;MELODIE TV;1-1003-13229
+608;Volksmusik;1-1003-13222
+609;Starparadies AT;1-1003-13226
+610;Mei Musi TV;1-1117-13015
+700;1-2-3.tv HD;1-1055-5502
+701;HSE24 HD;1-1053-21104
+702;HSE24 EXTRA HD;1-1055-5501
+703;HSE24 TREND;133-33-77
+704;QVC HD;1-1053-21103
+705;QVC PLUS HD;1-1055-5504
+706;QVC BEAUTY & STYLE HD;1-1033-10105
+707;MediaShop- Meine Einkaufswelt;133-7-775
+708;MediaShop- Neuheiten;133-33-898
+709;mediaspar HD;1-1033-10102
+710;meinTVshop;133-33-899
+711;Channel21 HD;1-1033-10104
+712;pearl.tv HD Shop;1-1109-5404
+713;Shop24Direct;1-1113-12633
+714;TV Shop;1-1109-5412
+715;Sparhandy TV;133-5-659
+716;Livington TV;133-5-74
+717;Juwelo HD;1-1109-5403
+718;Beauty TV;133-7-54
+719;Aristo.TV;1-1005-13311
+720;Genius Plus;1-1053-21113
+721;e8 television;133-33-897
+722;JML Shop;133-7-514
+723;sonnenklar.TV HD;1-1109-5400
+750;Fundorado TV;1-1113-12636
+751;Achtung Sexy TV;1-1113-12628
+752;Mobile Sex;1-1113-12625
+753;Babestation24;1-1113-12635
+754;eUrotic;1-1108-12123
+755;SEXYSAT TV;1-1040-31310
+756;Lustkanal24 TV;1-1113-12606
+757;GayBoys LIVE;1-1113-12612
+758;Deutsche Girls 24 TV;1-1113-12615
+759;Dreamgirls24 TV;1-1113-12618
+760;Erotiksat24 TV;1-1113-12619
+761;123-Damenwahl;1-1113-12620
+762;Maennersache TV;1-1113-12622
+763;Date Line;1-1113-12623
+764;Fotohandy;1-1113-12624
+765;SEX-Kontakte;1-1113-12626
+766;Eros TV;1-1113-12627
+767;Traumfrauen TV;1-1113-12629
+768;Heiss und Sexy TV;1-1113-12630
+769;EROTIKA TV - NEU!;1-1113-12639
+770;BunnyClub24;1-1113-12640
+771;Clipmobile;1-1113-12641
+772;MEDIA BROADCAST - Test 7;1-1113-12600
+800;K-TV;1-1113-12601
+801;Bibel TV HD;1-1003-13224
+802;EWTN katholisches TV;133-5-62
+803;HOPE Channel HD;1-1003-13227
+804;SOPHIA TV;1-1053-21112
+805;Die Neue Zeit TV;1-1015-4713
+806;GOD Channel;133-7-774
+807;Sonlife Broadcasting Network;1-1026-10080
+808;AstroTV;133-33-661
+900;Insight UHD;1-1097-2000
+901;Fashion 4K;1-1043-12510
+902;Fashion 4K Preview;1-1043-12501
+903;SES UHD Demo Channel;1-1035-1
+904;Canal+ UHD;1-1110-1001
+905;PEARL TV 4K UHD;1-1097-2010
+906;ASTRA 3D demo;1-1027-5101
 1000;1-2-3.tv;133-5-662
-1001;123-Damenwahl;1-1113-12620
-1002;3+;1-1015-4704
-1003;3sat;1-1079-28007
-1004;a.tv;1-1021-4600
-1005;Achtung Sexy TV;1-1113-12628
-1006;Al Jazeera Channel;1-1020-7009
-1007;Al Jazeera English;1-1028-4440
-1008;Algerie 3;1-1026-10082
-1009;ALT Sendersuchlauf starten!!;1-1113-12643
-1010;ANIXE SD;133-5-764
-1011;ARAGON TV;1-1032-30205
-1012;ARD-TEST-1;1-1073-28221
-1013;Arirang TV;1-1020-7011
-1014;arte;1-1051-28724
-1015;Babestation24;1-1113-12635
-1016;BAR+;1-1058-30129
-1017;BBC World;1-1026-10050
-1018;BB-MV Lokal-TV;133-7-70
-1019;BFM Business;1-1108-12180
-1020;BFM BUSINESS;1-1074-8303
-1021;Bibel TV;1-1108-12122
-1022;BR Fernsehen Nord;1-1101-28110
-1023;BR Fernsehen Nord HD;1-1025-10326
-1024;BR Fernsehen Süd;1-1101-28107
-1025;BunnyClub24;1-1113-12640
-1026;BVN TV;1-1048-4320
-1027;CANAL 24 HORAS;1-1028-4402
-1028;Canal Algerie;1-1026-10083
-1029;CANAL SUR A.;1-1046-30505
-1030;CANAL+;1-1076-8909
-1031;CashTV;1-1108-12185
-1032;CBC01;1-1089-12080
-1033;CCTV F;1-1022-6913
-1034;CCTV NEWS;1-1022-6914
-1035;CCTV9 Documentary;1-1022-6912
-1036;Channel21;133-7-769
-1037;Clipmobile;1-1113-12641
-1038;Comedy Central/VIVA;1-1078-28676
-1039;CONTRATO;1-1058-30169
-1040;Cubavision Internacional;1-1020-7008
-1041;Das Erste;1-1101-28106
-1042;Date Line;1-1113-12623
-1043;Deutsche Girls 24 TV;1-1113-12615
-1044;DMAX;133-33-63
-1045;Dolby Labs Test Stream;8770-0-1
-1046;Dreamgirls24 TV;1-1113-12618
-1047;DW (Arabia 2);1-1028-4435
-1048;Einsfestival;1-1051-28722
-1049;EinsPlus;1-1051-28723
-1050;Eros TV;1-1113-12627
-1051;EROTIKA TV - NEU!;1-1113-12639
-1052;Erotiksat24 TV;1-1113-12619
-1053;eUrotic;1-1108-12123
-1054;flimmit;1-1005-13310
-1055;Fotohandy;1-1113-12624
-1056;France 24 (en Français);1-1022-6905
-1057;France 24 (in Arabic);1-1022-6910
-1058;France 24 (in English);1-1022-6906
-1059;Franken Fernsehen;1-1021-4601
-1060;Fundorado TV;1-1113-12636
-1061;GayBoys LIVE;1-1113-12612
-1062;GUÍA;1-1058-30121
-1063;GUÍA FÁCIL;1-1058-30198
-1064;H2D Handshake 2 Deutschland;1-1015-4702
-1065;Heiss und Sexy TV;1-1113-12630
-1066;Homeshopping Sparhandy.TV;133-7-71
-1067;hr-fernsehen;1-1101-28108
-1068;HSE24;133-33-40
-1069;HSE24 EXTRA;1-1091-31210
-1070;I24 NEWS;1-1040-31307
-1071;INFO TNTSAT;1-1108-12150
-1072;Infokanaal TVV;53-1119-12810
-1073;intv;1-1021-4602
-1074;Juwelo TV;1-1113-12616
-1075;Kabel 1 Schweiz;1-1082-20003
-1076;kabel eins;1-1107-17502
-1077;KiKA;1-1079-28008
-1078;L EQUIPE 21;1-1040-31309
-1079;L EQUIPE 21;1-1040-31409
-1080;LCI;1-1090-9009
-1081;Lokal TV Portal;1-1021-4690
-1082;LTC;1-1052-29853
-1083;L-TV/TVM;1-1115-13113
-1084;Lustkanal24 TV;1-1113-12606
-1085;M6 BOUTIQUE LA CHAINE;1-1026-10063
-1086;Maennersache TV;1-1113-12622
-1087;Mainfranken;1-1021-4606
-1088;MDR Sachsen;1-1073-28228
-1089;MDR S-Anhalt;1-1073-28229
-1090;MDR S-Anhalt HD;1-1061-10353
-1091;MDR Thüringen;1-1073-28230
-1092;MDR Thüringen HD;1-1061-10354
-1093;MEDIA BROADCAST - Test 4;1-1113-12642
-1094;MEDIA BROADCAST - Test 5;1-1113-12621
-1095;MEDIA BROADCAST - Test 6;1-1113-12607
-1096;MEDIA BROADCAST - Test 7;1-1113-12600
-1097;mediasparTV Homeshopping;133-33-46
-1098;Mobile Sex;1-1113-12625
-1099;MULTISPORTS;1-1116-8410
-1100;multithek (Internet);1-1113-12644
-1101;münchen.tv;1-1021-4604
-1102;N24;1-1107-17503
-1103;NDR FS HH;1-1073-28225
-1104;NDR FS HH HD;1-1025-10329
-1105;NDR FS MV;1-1073-28224
-1106;NDR FS MV HD;1-1025-10328
-1107;NDR FS NDS;1-1073-28226
-1108;NDR FS SH;1-1073-28227
-1109;NDR FS SH HD;1-1025-10330
-1110;NHK World TV;1-1020-7014
-1111;Nickelodeon;1-1078-28680
-1112;Niederbayern;1-1021-4609
-1113;ORF2E;1-1117-13014
-1114;pearl.tv Shop;133-7-765
-1115;PHOENIX;1-1051-28725
-1116;PORTADA;1-1058-30108
-1117;PORTADA;1-1058-30150
-1118;PORTADA C5;1-1058-30107
-1119;Pro7 MAXX;1-1107-17505
-1120;ProSieben;1-1107-17501
-1121;ProSieben Schweiz;1-1082-20001
-1122;QVC;133-5-1794
-1123;QVC BEAUTY&STYLE;133-5-64
-1124;QVC Deutschland;1-1108-12100
-1125;QVC PLUS;1-1108-3394
-1126;Radio Bremen TV;1-1201-28385
-1127;RADIOS;1-1058-30102
-1128;Rai 2 HD;1-1006-4211
-1129;Rai 3 HD;1-1006-4212
-1130;Rai HD;1-1006-4210
-1131;RAI News 24;1-1006-4216
-1132;rbb Berlin;1-1073-28206
-1133;rbb Brandenburg;1-1073-28205
-1134;rbb Brandenburg HD;1-1061-10350
-1135;REGIO TV;133-33-47
-1136;rfo Regional Oberbayern;1-1021-4605
-1137;rhein main tv;1-1113-12614
-1138;RT Esp;1-1020-7013
-1139;RT Esp HD;1-1012-6382
-1140;RT Esp HD;1-1012-6392
-1141;RT HD;1-1012-6381
-1142;RTL 2 CH;1-1013-12400
-1143;RTL CH;1-1091-28825
-1144;RTL FS;1-1089-12006
-1145;RTL HB NDS;1-1089-12005
-1146;RTL Regional NRW;1-1089-12004
-1147;RTL Television;1-1089-12003
-1148;RTL2;1-1089-12020
-1149;RTLNITRO;1-1089-12061
-1150;Russia Today;1-1022-6904
-1151;SAT.1;1-1107-17500
-1152;SAT.1 Bayern;1-1107-17507
-1153;SAT.1 CH;1-1082-20006
-1154;SAT.1 Gold;1-1107-17504
-1155;SAT.1 HH/SH;1-1082-20008
-1156;SAT.1 NRW;1-1107-17508
-1157;SAT.1 NS/Bremen;1-1082-20009
-1158;SAT.1 RhlPf/Hessen;1-1082-20010
-1159;Service 13230;1-1003-13230
-1160;Service 13231;1-1003-13231
-1161;Service 13232;1-1003-13232
-1162;Service 13233;1-1003-13233
-1163;Service 13313;1-1005-13313
-1164;Service 13314;1-1005-13314
-1165;ServusTV Deutschland;1-1115-13110
-1166;ServusTV HD Deutschland;1-1007-4914
-1167;SES 01;1-1015-4700
-1168;SES 04;1-1015-4703
-1169;SES 06;1-1015-4705
-1170;SES 07;1-1015-4706
-1171;SES 08;1-1015-4707
-1172;SES 09;1-1015-4708
-1173;SES 10;1-1015-4709
-1174;SES 75;1-1053-21111
-1175;SEX-Kontakte;1-1113-12626
-1176;SEXYSAT TV;1-1040-31310
-1177;SIXX;133-5-776
-1178;Sky INFO;133-9-141
-1179;Sky News Intl;1-1111-7290
-1180;Sky Select;133-4-18
-1181;Sonnenklar TV;133-33-32
-1182;SOPHIA TV;1-1015-4712
-1183;SPORT 365;1-1076-8906
-1184;SR Fernsehen;1-1093-28486
-1185;SR Fernsehen HD;1-1039-10378
-1186;SSU Samsung;1-1020-7005
-1187;STB Comag;1-1111-7266
-1188;STN test 1;1-1045-31501
-1189;STN Test 10;1-1045-31510
-1190;STN test 2;1-1045-31502
-1191;STN test 3;1-1045-31503
-1192;STN Test 4;1-1045-31504
-1193;STN Test 5;1-1045-31505
-1194;STN Test 6;1-1045-31506
-1195;STN Test 7;1-1045-31507
-1196;STN Test 8;1-1045-31508
-1197;STN Test 9;1-1045-31509
-1198;SUPER RTL;1-1089-12040
-1199;SWR Fernsehen BW;1-1101-28113
-1200;SWR Fernsehen RP;1-1073-28231
-1201;SWR RP HD;1-1019-10304
-1202;tagesschau24;1-1051-28721
-1203;TAQUILLA;1-1058-30128
-1204;TAQUILLA;1-1058-30130
-1205;TAQUILLA 3 HD;1-1056-29953
-1206;TBN Espana;1-1040-31305
-1207;TecTime TV;1-1109-5411
-1208;TELESUR;1-1040-31304
-1209;TEST;53-1105-4066
-1210;TEST CZ;1-1044-30861
-1211;TEST TÉCNICO;1-1058-30173
-1212;TEST_CSD1;1-1058-30174
-1213;TEST_CSD2;1-1058-30175
-1214;TEST_CSD3;1-1058-30176
-1215;TEST_CSD4;1-1058-30177
-1216;TEST_CSD5;1-1058-30178
-1217;Test-R;1-1051-28726
-1218;Traumfrauen TV;1-1113-12629
-1219;TRT Turk;1-1027-5113
-1220;TV Oberfranken;1-1021-4607
-1221;TV Record SD;1-1040-31301
-1222;TV TRWAM;1-1048-4310
-1223;TV5 MONDE;1-1086-9910
-1224;TV5MONDE EUROPE;1-1022-6915
-1225;TVA-OTV;1-1021-4608
-1226;TVE INTERNACIONAL EUROPA;1-1028-4401
-1227;TVGA;1-1040-31306
-1228;TWOJ;1-1027-5601
-1229;TWOJ;1-1029-32000
-1230;UHD1 by ASTRA / HD+;1-1035-2
-1231;Ulm-Allgäu;1-1021-4603
-1232;VH1 Classic.;1-1066-28667
-1233;VISIT-X.tv;1-1115-13107
-1234;VOX;1-1089-12060
-1235;VOX CH;1-1089-12041
-1236;VOX CH;1-1091-28820
-1237;WDR Aachen;1-1111-28534
-1238;WDR Bielefeld;1-1201-28306
-1239;WDR Bonn;1-1111-28536
-1240;WDR Dortmund;1-1201-28307
-1241;WDR Duisburg;1-1111-28537
-1242;WDR Düsseldorf;1-1201-28308
-1243;WDR Essen;1-1201-28309
-1244;WDR HD Aachen;1-1111-28544
-1245;WDR HD Bielefeld;1-1201-28326
-1246;WDR HD Bonn;1-1111-28546
-1247;WDR HD Dortmund;1-1201-28327
-1248;WDR HD Duisburg;1-1111-28547
-1249;WDR HD Düsseldorf;1-1201-28328
-1250;WDR HD Essen;1-1201-28329
-1251;WDR HD Münster;1-1201-28330
-1252;WDR HD Siegen;1-1201-28331
-1253;WDR HD Wuppertal;1-1111-28545
-1254;WDR Köln;1-1101-28111
-1255;WDR Münster;1-1201-28310
-1256;WDR Siegen;1-1201-28311
-1257;WDR Test A;1-1201-28395
-1258;WDR Wuppertal;1-1111-28535
-1259;YOMVI;1-1032-30203
-1260;ZDF;1-1079-28006
-1261;zdf.kultur;1-1079-28016
-1262;zdf_neo;1-1079-28014
-1263;ZDFinfo;1-1079-28011
+1001;3+;1-1015-4704
+1002;3sat;1-1079-28007
+1003;ALT Sendersuchlauf starten!!;1-1113-12643
+1004;ANIXE SD;133-5-764
+1005;ARD-TEST-1;1-1073-28221
+1006;arte;1-1051-28724
+1007;BAR+;1-1058-30129
+1008;BBC World;1-1026-10050
+1009;BFM Business;1-1108-12180
+1010;Bibel TV;1-1108-12122
+1011;BR Fernsehen Nord;1-1101-28110
+1012;BR Fernsehen Nord HD;1-1025-10326
+1013;BR Fernsehen Süd;1-1101-28107
+1014;CANAL+;1-1076-8909
+1015;CashTV;1-1108-12185
+1016;CBC01;1-1089-12080
+1017;Channel21;133-7-769
+1018;Comedy Central/VIVA;1-1078-28676
+1019;CONTRATO;1-1058-30169
+1020;Das Erste;1-1101-28106
+1021;DMAX;133-33-63
+1022;Dolby Labs Test Stream;8770-0-1
+1023;Einsfestival;1-1051-28722
+1024;EinsPlus;1-1051-28723
+1025;flimmit;1-1005-13310
+1026;GUÍA;1-1058-30121
+1027;GUÍA FÁCIL;1-1058-30198
+1028;H2D Handshake 2 Deutschland;1-1015-4702
+1029;Homeshopping Sparhandy.TV;133-7-71
+1030;hr-fernsehen;1-1101-28108
+1031;HSE24;133-33-40
+1032;HSE24 EXTRA;1-1091-31210
+1033;Juwelo TV;1-1113-12616
+1034;Kabel 1 Schweiz;1-1082-20003
+1035;kabel eins;1-1107-17502
+1036;KiKA;1-1079-28008
+1037;L EQUIPE 21;1-1040-31309
+1038;L EQUIPE 21;1-1040-31409
+1039;MDR Sachsen;1-1073-28228
+1040;MDR S-Anhalt;1-1073-28229
+1041;MDR S-Anhalt HD;1-1061-10353
+1042;MDR Thüringen;1-1073-28230
+1043;MDR Thüringen HD;1-1061-10354
+1044;MEDIA BROADCAST - Test 4;1-1113-12642
+1045;MEDIA BROADCAST - Test 5;1-1113-12621
+1046;MEDIA BROADCAST - Test 6;1-1113-12607
+1047;mediasparTV Homeshopping;133-33-46
+1048;MULTISPORTS;1-1116-8410
+1049;multithek (Internet);1-1113-12644
+1050;N24;1-1107-17503
+1051;NDR FS HH;1-1073-28225
+1052;NDR FS HH HD;1-1025-10329
+1053;NDR FS MV;1-1073-28224
+1054;NDR FS MV HD;1-1025-10328
+1055;NDR FS NDS;1-1073-28226
+1056;NDR FS SH;1-1073-28227
+1057;NDR FS SH HD;1-1025-10330
+1058;NHK World TV;1-1020-7014
+1059;Nickelodeon;1-1078-28680
+1060;ORF2E;1-1117-13014
+1061;pearl.tv Shop;133-7-765
+1062;PHOENIX;1-1051-28725
+1063;PORTADA;1-1058-30108
+1064;PORTADA C5;1-1058-30107
+1065;Pro7 MAXX;1-1107-17505
+1066;ProSieben;1-1107-17501
+1067;ProSieben Schweiz;1-1082-20001
+1068;QVC;133-5-1794
+1069;QVC BEAUTY&STYLE;133-5-64
+1070;QVC Deutschland;1-1108-12100
+1071;QVC PLUS;1-1108-3394
+1072;Radio Bremen TV;1-1201-28385
+1073;Rai 2 HD;1-1006-4211
+1074;Rai 3 HD;1-1006-4212
+1075;Rai HD;1-1006-4210
+1076;rbb Berlin;1-1073-28206
+1077;rbb Brandenburg;1-1073-28205
+1078;rbb Brandenburg HD;1-1061-10350
+1079;RT Esp;1-1020-7013
+1080;RT Esp HD;1-1012-6392
+1081;RTL 2 CH;1-1013-12400
+1082;RTL CH;1-1091-28825
+1083;RTL FS;1-1089-12006
+1084;RTL HB NDS;1-1089-12005
+1085;RTL Regional NRW;1-1089-12004
+1086;RTL Television;1-1089-12003
+1087;RTL2;1-1089-12020
+1088;RTLNITRO;1-1089-12061
+1089;Russia Today;1-1022-6904
+1090;SAT.1;1-1107-17500
+1091;SAT.1 Bayern;1-1107-17507
+1092;SAT.1 CH;1-1082-20006
+1093;SAT.1 Gold;1-1107-17504
+1094;SAT.1 HH/SH;1-1082-20008
+1095;SAT.1 NRW;1-1107-17508
+1096;SAT.1 NS/Bremen;1-1082-20009
+1097;SAT.1 RhlPf/Hessen;1-1082-20010
+1098;Service 13230;1-1003-13230
+1099;Service 13231;1-1003-13231
+1100;Service 13232;1-1003-13232
+1101;Service 13233;1-1003-13233
+1102;Service 13313;1-1005-13313
+1103;Service 13314;1-1005-13314
+1104;ServusTV Deutschland;1-1115-13110
+1105;ServusTV HD Deutschland;1-1007-4914
+1106;SES 01;1-1015-4700
+1107;SES 04;1-1015-4703
+1108;SES 06;1-1015-4705
+1109;SES 07;1-1015-4706
+1110;SES 08;1-1015-4707
+1111;SES 09;1-1015-4708
+1112;SES 10;1-1015-4709
+1113;SES 75;1-1053-21111
+1114;SIXX;133-5-776
+1115;Sky INFO;133-9-141
+1116;Sky Select;133-4-18
+1117;Sonnenklar TV;133-33-32
+1118;SOPHIA TV;1-1015-4712
+1119;SPORT 365;1-1076-8906
+1120;SR Fernsehen;1-1093-28486
+1121;SR Fernsehen HD;1-1039-10378
+1122;SSU Samsung;1-1020-7005
+1123;STB Comag;1-1111-7266
+1124;STN Test 10;1-1045-31510
+1125;STN test 2;1-1045-31502
+1126;STN test 3;1-1045-31503
+1127;STN Test 4;1-1045-31504
+1128;STN Test 5;1-1045-31505
+1129;STN Test 6;1-1045-31506
+1130;STN Test 7;1-1045-31507
+1131;STN Test 8;1-1045-31508
+1132;STN Test 9;1-1045-31509
+1133;SUPER RTL;1-1089-12040
+1134;SWR Fernsehen BW;1-1101-28113
+1135;SWR Fernsehen RP;1-1073-28231
+1136;SWR RP HD;1-1019-10304
+1137;tagesschau24;1-1051-28721
+1138;TAQUILLA;1-1058-30128
+1139;TAQUILLA;1-1058-30130
+1140;TAQUILLA 3 HD;1-1056-29953
+1141;TecTime TV;1-1109-5411
+1142;TEST;53-1105-4066
+1143;TEST CZ;1-1044-30861
+1144;TEST TÉCNICO;1-1058-30173
+1145;TEST_CSD1;1-1058-30174
+1146;TEST_CSD2;1-1058-30175
+1147;TEST_CSD3;1-1058-30176
+1148;TEST_CSD4;1-1058-30177
+1149;TEST_CSD5;1-1058-30178
+1150;Test-R;1-1051-28726
+1151;TV5MONDE EUROPE;1-1022-6915
+1152;TWOJ;1-1029-32000
+1153;UHD1 by ASTRA / HD+;1-1035-2
+1154;VH1 Classic.;1-1066-28667
+1155;VISIT-X.tv;1-1115-13107
+1156;VOX;1-1089-12060
+1157;VOX CH;1-1089-12041
+1158;VOX CH;1-1091-28820
+1159;WDR Aachen;1-1111-28534
+1160;WDR Bielefeld;1-1201-28306
+1161;WDR Bonn;1-1111-28536
+1162;WDR Dortmund;1-1201-28307
+1163;WDR Duisburg;1-1111-28537
+1164;WDR Düsseldorf;1-1201-28308
+1165;WDR Essen;1-1201-28309
+1166;WDR HD Aachen;1-1111-28544
+1167;WDR HD Bielefeld;1-1201-28326
+1168;WDR HD Bonn;1-1111-28546
+1169;WDR HD Dortmund;1-1201-28327
+1170;WDR HD Duisburg;1-1111-28547
+1171;WDR HD Düsseldorf;1-1201-28328
+1172;WDR HD Essen;1-1201-28329
+1173;WDR HD Münster;1-1201-28330
+1174;WDR HD Siegen;1-1201-28331
+1175;WDR HD Wuppertal;1-1111-28545
+1176;WDR Köln;1-1101-28111
+1177;WDR Münster;1-1201-28310
+1178;WDR Siegen;1-1201-28311
+1179;WDR Test A;1-1201-28395
+1180;WDR Wuppertal;1-1111-28535
+1181;ZDF;1-1079-28006
+1182;zdf.kultur;1-1079-28016
+1183;zdf_neo;1-1079-28014
+1184;ZDFinfo;1-1079-28011
 2000;Sky Atlantic HD;133-13-110
 2001;Sky Atlantic+1 HD;133-8-144
 2002;Fox HD;133-10-124
@@ -1311,51 +1311,51 @@
 8097;Kathrein Download;1-1111-7299
 8098;Kathrein DVB SSU;1-1111-7297
 8099;LE PORN;1-1098-9169
-8100;M7 DL DSR7121;53-1105-4091
-8101;M7 DL DSR7141;53-1105-4095
-8102;M7 DL DSR8121;53-1105-4093
-8103;M7 DL DSR8141;53-1105-4097
-8104;M7 SAT801;53-1105-4099
-8105;M7 SAT901;53-1105-4082
-8106;M7 Zenterio;53-1105-4084
-8107;MES VIDEOS;1-1098-9104
-8108;MON NICK JUNIOR;1-1098-9121
-8109;MOSAIQUE;1-1096-8622
-8110;MTO C5-YPLUS;1-1058-30116
-8111;MY MTV;1-1098-9120
-8112;MYTF1;1-1098-9173
-8113;Nagra DL DSR7121;53-1105-4092
-8114;Nagra DL DSR7141;53-1105-4096
-8115;Nagra DL DSR8121;53-1105-4094
-8116;Nagra DL DSR8141;53-1105-4098
-8117;NDS Applikation;133-4-2691
-8118;Opentech;1-1111-7259
-8119;Pace DS 830 NP;133-3-4024
-8120;Pace TDC 866 NSDX;133-2-3994
-8121;Pace TDS 865 NSD;133-12-4028
-8122;Pace TDS 865 NSDX;133-12-4017
-8123;Pace TDS 866 NSD;133-12-3997
-8124;Pace TDS 866 NSDX;133-12-3998
-8125;Panasonic Viera;1-1111-7281
-8126;PASS PINK X;1-1098-9174
-8127;PASS SERIES;1-1098-9170
-8128;PASS XXL DORCEL;1-1098-9171
-8129;RADIOS 1;1-1098-9114
-8130;RADIOS 2;1-1098-9113
-8131;RADIOS 3;1-1098-9116
-8132;RAPS;1-1113-12613
-8133;RF;1-1098-9115
-8134;ROVI Guide;1-1111-7201
-8135;Samsung iDTV EU Upgrade;1-1111-7287
-8136;Samsung2;1-1111-7220
-8137;SatRecord;1-1111-7920
-8138;Schwaiger OTA Service;1-1117-13200
-8139;SES-LCN2;1-1111-7911
-8140;SGI_1111;1-1111-7910
-8141;SKYMASTER1;1-1111-7260
-8142;SKYMASTER2;1-1111-7263
-8143;STB Comag1;1-1111-7264
-8144;STB Inverto;1-1111-7243
+8100;STB Inverto;1-1111-7243
+8101;M7 DL DSR7121;53-1105-4091
+8102;M7 DL DSR7141;53-1105-4095
+8103;M7 DL DSR8121;53-1105-4093
+8104;M7 DL DSR8141;53-1105-4097
+8105;M7 SAT801;53-1105-4099
+8106;M7 SAT901;53-1105-4082
+8107;M7 Zenterio;53-1105-4084
+8108;MES VIDEOS;1-1098-9104
+8109;MON NICK JUNIOR;1-1098-9121
+8110;MOSAIQUE;1-1096-8622
+8111;MTO C5-YPLUS;1-1058-30116
+8112;MY MTV;1-1098-9120
+8113;MYTF1;1-1098-9173
+8114;Nagra DL DSR7121;53-1105-4092
+8115;Nagra DL DSR7141;53-1105-4096
+8116;Nagra DL DSR8121;53-1105-4094
+8117;Nagra DL DSR8141;53-1105-4098
+8118;NDS Applikation;133-4-2691
+8119;Opentech;1-1111-7259
+8120;Pace DS 830 NP;133-3-4024
+8121;Pace TDC 866 NSDX;133-2-3994
+8122;Pace TDS 865 NSD;133-12-4028
+8123;Pace TDS 865 NSDX;133-12-4017
+8124;Pace TDS 866 NSD;133-12-3997
+8125;Pace TDS 866 NSDX;133-12-3998
+8126;Panasonic Viera;1-1111-7281
+8127;PASS PINK X;1-1098-9174
+8128;PASS SERIES;1-1098-9170
+8129;PASS XXL DORCEL;1-1098-9171
+8130;RADIOS 1;1-1098-9114
+8131;RADIOS 2;1-1098-9113
+8132;RADIOS 3;1-1098-9116
+8133;RAPS;1-1113-12613
+8134;RF;1-1098-9115
+8135;ROVI Guide;1-1111-7201
+8136;Samsung iDTV EU Upgrade;1-1111-7287
+8137;Samsung2;1-1111-7220
+8138;SatRecord;1-1111-7920
+8139;Schwaiger OTA Service;1-1117-13200
+8140;SES-LCN2;1-1111-7911
+8141;SGI_1111;1-1111-7910
+8142;SKYMASTER1;1-1111-7260
+8143;SKYMASTER2;1-1111-7263
+8144;STB Comag1;1-1111-7264
 8145;STB METZ Werke;1-1111-7293
 8146;STB Panasonic;1-1111-7267
 8147;STB Sandmartin;1-1111-7277
--- a/source/ChanSort/ReferenceLists/at_liwest.txt
+++ b/source/ChanSort/ReferenceLists/at_liwest.txt
--- 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
--- a/source/Images/imagelist/0038.png
+++ b/source/Images/imagelist/0038.png
--- a/source/Images/imagelist/0039.png
+++ b/source/Images/imagelist/0039.png
--- a/source/Images/imagelist/0040.png
+++ b/source/Images/imagelist/0040.png