improved usability

2026-01-19 13:52:04 +01:00 · 2016-04-27 19:03:50 +02:00
parent a879a4c1fe
commit aaba300f2d
16 changed files with 1556 additions and 1461 deletions
--- a/source/ChanSort.Api/Controller/Editor.cs
+++ b/source/ChanSort.Api/Controller/Editor.cs
@@ -23,10 +23,7 @@ namespace ChanSort.Api
      int progNr = this.ChannelList.InsertProgramNumber;
      int relativeChannelNumber = 0;
      int progNrCopy = progNr; // prevent "access to modified closure" warning
-      foreach (
-        var channel in
-          this.ChannelList.Channels.Where(c => c.GetPosition(this.SubListIndex) >= progNrCopy)
-              .OrderBy(c => c.GetPosition(this.SubListIndex)))
+      foreach (var channel in this.ChannelList.Channels.Where(c => c.GetPosition(this.SubListIndex) >= progNrCopy).OrderBy(c => c.GetPosition(this.SubListIndex)))
      {
        var curPos = channel.GetPosition(this.SubListIndex);
        int gap = count - (curPos - progNr - relativeChannelNumber);
--- a/source/ChanSort.Api/Model/ChannelInfo.cs
+++ b/source/ChanSort.Api/Model/ChannelInfo.cs
@@ -17,6 +17,7 @@ namespace ChanSort.Api

    public virtual bool IsDeleted { get; set; }
    public SignalSource SignalSource { get; set; }
+    public string Source { get; set; }
    public long RecordIndex { get; set; }
    public int RecordOrder { get; set; }
    public int OldProgramNr { get; set; }
@@ -44,7 +45,8 @@ namespace ChanSort.Api
    public string Debug { get; private set; }
    public string SatPosition { get; set; }
    public Transponder Transponder { get; set; }
-    public IList<int> FavIndex { get; private set; }
+    public List<int> FavIndex { get; }
+    public List<int> OldFavIndex { get; }
    public int ProgramNrPreset { get; set; }

    public bool IsNameModified { get; set; }
@@ -54,8 +56,12 @@ namespace ChanSort.Api
    {
      this.NewProgramNr = -1;
      this.FavIndex = new List<int>(MAX_FAV_LISTS);
+      this.OldFavIndex = new List<int>(MAX_FAV_LISTS);
      for (int i = 0; i < MAX_FAV_LISTS; i++)
+      {
        this.FavIndex.Add(-1);
+        this.OldFavIndex.Add(-1);
+      }
      this.Name = "";
      this.ShortName = "";
    }
@@ -248,6 +254,11 @@ namespace ChanSort.Api
      return subListIndex == 0 ? this.NewProgramNr : this.FavIndex[subListIndex - 1];
    }

+    public int GetOldPosition(int subListIndex)
+    {
+      return subListIndex == 0 ? this.OldProgramNr : this.OldFavIndex[subListIndex - 1];
+    }
+
    public void SetPosition(int subListIndex, int newPos)
    {
      if (subListIndex == 0)
--- a/source/ChanSort.Api/Model/ChannelList.cs
+++ b/source/ChanSort.Api/Model/ChannelList.cs
@@ -30,7 +30,7 @@ namespace ChanSort.Api
    public int MaxChannelNameLength { get; set; }
    public int PresetProgramNrCount { get; private set; }
    public IList<string> VisibleColumnFieldNames;
-    public bool IsMixedSouceFavoritesList { get; set; }
+    public bool IsMixedSourceFavoritesList { get; set; }

    #region Caption
    public string Caption
@@ -82,6 +82,9 @@ namespace ChanSort.Api
        }
      }

+      for (int i = 0; i < ci.FavIndex.Count; i++)
+        ci.OldFavIndex[i] = ci.FavIndex[i];
+
      if (!isDupeProgNr)
        this.channelByProgNr[ci.OldProgramNr] = ci;

--- a/source/ChanSort.Api/Model/DataRoot.cs
+++ b/source/ChanSort.Api/Model/DataRoot.cs
@@ -61,7 +61,7 @@ namespace ChanSort.Api
    public virtual void AddChannelList(ChannelList list)
    {
      this.channelLists.Add(list);
-      this.MixedSourceFavorites |= list.IsMixedSouceFavoritesList;
+      this.MixedSourceFavorites |= list.IsMixedSourceFavoritesList;
    }
    #endregion

--- a/source/ChanSort.Loader.Hisense/HisDbSerializer.cs
+++ b/source/ChanSort.Loader.Hisense/HisDbSerializer.cs
@@ -12,7 +12,7 @@ namespace ChanSort.Loader.Hisense
 {
  public class HisDbSerializer : SerializerBase
  {
-    public override string DisplayName => "Hisense *.db Loader";
+    public override string DisplayName => "Hisense channel.db Loader";

    #region enums and bitmasks

@@ -106,15 +106,17 @@ namespace ChanSort.Loader.Hisense
      channelLists.Add(new ChannelList(SignalSource.Antenna | SignalSource.Cable | SignalSource.Sat | SignalSource.Analog | SignalSource.Digital | SignalSource.Radio | SignalSource.Tv, "CI 2"));

      channelLists.Add(new ChannelList(SignalSource.AnalogCT | SignalSource.DvbCT | SignalSource.DvbS | SignalSource.TvAndRadio, "Favorites"));
-      channelLists[channelLists.Count - 1].IsMixedSouceFavoritesList = true;
+      channelLists[channelLists.Count - 1].IsMixedSourceFavoritesList = true;

      foreach (var list in this.channelLists)
      {
        this.DataRoot.AddChannelList(list);
        list.VisibleColumnFieldNames = new List<string>
        {
+          "OldPosition",
          "Position",
-          "OldProgramNr",
+          "Source",
+          "NewProgramNr",
          "Name",
          "ShortName",
          "Favorites",
@@ -385,6 +387,7 @@ namespace ChanSort.Loader.Hisense
          enhanceChannelInfo(ci, r, 9);

          var list = this.channelLists[tableNr - 1];
+          ci.Source = list.ShortCaption;
          this.DataRoot.AddChannel(list, ci);

          // add the channel to all favorites lists
@@ -521,7 +524,6 @@ namespace ChanSort.Loader.Hisense

    private void UpdateChannel(SQLiteCommand cmd, ChannelInfo ci)
    {
-      //return;
      if (ci.RecordIndex < 0) // skip reference list proxy channels
        return; 

@@ -534,11 +536,11 @@ namespace ChanSort.Loader.Hisense
      if (!ci.Hidden && ci.NewProgramNr >= 0) setFlags |= NwMask.Visible;

      cmd.CommandText = $"update svl_{x} set channel_id=(channel_id&{0x3FFFF})|(@chnr << 18)" +
-                        ", ch_id_txt=@chnr || '   0'" +
-                        ", ac_name=@name" +
+                        $", ch_id_txt=@chnr || '   0'" +
+                        $", ac_name=@name" +
                        $", option_mask=option_mask|{(int) (OptionMask.ChNumEdited | OptionMask.NameEdited)}" +
-                        ", nw_mask=(nw_mask&@resetFlags)|@setFlags" +
-                        " where svl_rec_id=@id";
+                        $", nw_mask=(nw_mask&@resetFlags)|@setFlags" +
+                        $" where svl_rec_id=@id";
      cmd.Parameters.Clear();
      cmd.Parameters.Add("@id", DbType.Int32);
      cmd.Parameters.Add("@chnr", DbType.Int32);
--- a/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs
+++ b/source/ChanSort.Loader.Hisense/HisDbSerializerPlugin.cs
@@ -13,7 +13,7 @@ namespace ChanSort.Loader.Hisense
  public class HisDbSerializerPlugin : ISerializerPlugin
  {
    public string PluginName => "Hisense *.db";
-    public string FileFilter => "channel.db";
+    public string FileFilter => "channel*.db";

 #region CreateSerializer()
    public SerializerBase CreateSerializer(string inputFile)
--- a/source/ChanSort.Loader.Samsung/ScmSerializer.cs
+++ b/source/ChanSort.Loader.Samsung/ScmSerializer.cs
@@ -645,10 +645,7 @@ namespace ChanSort.Loader.Samsung
    private void WriteChannels(ChannelList list, byte[] fileContent, FileStream stream)
    {
      foreach (var channel in list.Channels)
-      {
        channel.UpdateRawData();
-        channel.OldProgramNr = channel.NewProgramNr;
-      }

      stream.Write(fileContent, 0, fileContent.Length);
    }
--- a/source/ChanSort/MainForm.Designer.cs
+++ b/source/ChanSort/MainForm.Designer.cs
@@ -66,6 +66,8 @@
      this.colIndex = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colSlotOld = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colSlotNew = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colSource = new DevExpress.XtraGrid.Columns.GridColumn();
+      this.colPrNr = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colName = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colShortName = new DevExpress.XtraGrid.Columns.GridColumn();
      this.colFavorites = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -302,6 +304,7 @@
      this.gviewLeft.OptionsBehavior.EditorShowMode = DevExpress.Utils.EditorShowMode.MouseDown;
      this.gviewLeft.OptionsCustomization.AllowGroup = false;
      this.gviewLeft.OptionsCustomization.AllowQuickHideColumns = false;
+      this.gviewLeft.OptionsDetail.EnableMasterViewMode = false;
      this.gviewLeft.OptionsLayout.LayoutVersion = "2";
      this.gviewLeft.OptionsSelection.MultiSelect = true;
      this.gviewLeft.OptionsView.ColumnAutoWidth = false;
@@ -561,6 +564,8 @@
            this.colIndex,
            this.colSlotOld,
            this.colSlotNew,
+            this.colSource,
+            this.colPrNr,
            this.colName,
            this.colShortName,
            this.colFavorites,
@@ -591,11 +596,13 @@
      this.gviewRight.Name = "gviewRight";
      this.gviewRight.OptionsBehavior.EditorShowMode = DevExpress.Utils.EditorShowMode.MouseDown;
      this.gviewRight.OptionsCustomization.AllowGroup = false;
-      this.gviewRight.OptionsLayout.LayoutVersion = "3";
+      this.gviewRight.OptionsDetail.EnableMasterViewMode = false;
+      this.gviewRight.OptionsLayout.LayoutVersion = "5";
      this.gviewRight.OptionsSelection.MultiSelect = true;
      this.gviewRight.OptionsView.ColumnAutoWidth = false;
      this.gviewRight.OptionsView.ShowAutoFilterRow = true;
      this.gviewRight.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never;
+      this.gviewRight.OptionsView.ShowGroupExpandCollapseButtons = false;
      this.gviewRight.OptionsView.ShowGroupPanel = false;
      this.gviewRight.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
            new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.colSlotOld, DevExpress.Data.ColumnSortOrder.Ascending)});
@@ -627,10 +634,11 @@
      resources.ApplyResources(this.colSlotOld, "colSlotOld");
      this.colSlotOld.DisplayFormat.FormatString = "d";
      this.colSlotOld.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
-      this.colSlotOld.FieldName = "OldProgramNr";
+      this.colSlotOld.FieldName = "OldPosition";
      this.colSlotOld.Name = "colSlotOld";
      this.colSlotOld.OptionsColumn.AllowEdit = false;
      this.colSlotOld.OptionsFilter.AllowAutoFilter = false;
+      this.colSlotOld.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
      // 
      // colSlotNew
      // 
@@ -641,6 +649,19 @@
      this.colSlotNew.Name = "colSlotNew";
      this.colSlotNew.UnboundType = DevExpress.Data.UnboundColumnType.Integer;
      // 
+      // colSource
+      // 
+      resources.ApplyResources(this.colSource, "colSource");
+      this.colSource.FieldName = "Source";
+      this.colSource.Name = "colSource";
+      // 
+      // colPrNr
+      // 
+      resources.ApplyResources(this.colPrNr, "colPrNr");
+      this.colPrNr.FieldName = "NewProgramNr";
+      this.colPrNr.Name = "colPrNr";
+      this.colPrNr.OptionsColumn.AllowEdit = false;
+      // 
      // colName
      // 
      resources.ApplyResources(this.colName, "colName");
@@ -2204,6 +2225,8 @@
    private DevExpress.XtraSplashScreen.SplashScreenManager splashScreenManager1;
    private DevExpress.XtraEditors.LabelControl lblPredefinedList;
    private DevExpress.XtraBars.BarButtonItem miAllowEditPredefinedLists;
+    private DevExpress.XtraGrid.Columns.GridColumn colPrNr;
+    private DevExpress.XtraGrid.Columns.GridColumn colSource;
  }
 }

--- a/source/ChanSort/MainForm.cs
+++ b/source/ChanSort/MainForm.cs
@@ -599,9 +599,13 @@ namespace ChanSort.Ui
    {
      if (this.currentChannelList != null)
        this.SaveInputGridLayout(this.currentChannelList.SignalSource);
+
+      this.currentChannelList = channelList;
+      this.editor.ChannelList = channelList;
+
      if (channelList != null)
      {
-        this.LoadInputGridLayout(channelList);
+        this.LoadInputGridLayout();
        this.gridRight.DataSource = channelList.Channels;
        this.gridLeft.DataSource = channelList.Channels;

@@ -614,7 +618,7 @@ namespace ChanSort.Ui

        if (this.dataRoot.MixedSourceFavorites)
        {
-          if (channelList.IsMixedSouceFavoritesList)
+          if (channelList.IsMixedSourceFavoritesList)
          {
            this.tabSubList.SelectedTabPageIndex = 1;
            this.pageProgNr.PageVisible = false;
@@ -633,7 +637,7 @@ namespace ChanSort.Ui
          this.grpSubList.Visible = dataRoot.SortedFavorites;
        }
        
-        //this.tabSubList.TabPages[0].PageVisible = !channelList.IsMixedSouceFavoritesList;
+        //this.tabSubList.TabPages[0].PageVisible = !channelList.IsMixedSourceFavoritesList;
        //this.pageProgNr.Enabled = this.pageProgNr.Visible;
      }
      else
@@ -642,8 +646,6 @@ namespace ChanSort.Ui
        this.gridLeft.DataSource = null;
        this.grpSubList.Visible = false;
      }
-      this.currentChannelList = channelList;
-      this.editor.ChannelList = channelList;

      if (gviewRight.IsValidRowHandle(0))
        this.SelectFocusedRow(this.gviewRight, 0);
@@ -867,6 +869,17 @@ namespace ChanSort.Ui
            File.Copy(currentTvFile, bakFile);
        }
        this.currentTvSerializer.Save(this.currentTvFile);
+
+        // after saving old numbers match the new numbers
+        foreach (var list in this.dataRoot.ChannelLists)
+        {
+          foreach (var chan in list.Channels)
+          {
+            chan.OldProgramNr = chan.NewProgramNr;
+            chan.OldFavIndex.Clear();
+            chan.OldFavIndex.AddRange(chan.FavIndex);
+          }
+        }
      }
      finally
      {
@@ -1024,11 +1037,15 @@ namespace ChanSort.Ui
      int maxNr = this.currentChannelList.InsertProgramNumber;
      foreach (var channel in this.currentChannelList.Channels)
        maxNr = Math.Max(maxNr, channel.GetPosition(this.subListIndex));
-      foreach (var channel in this.currentChannelList.Channels)
+
+      var max = this.gviewRight.RowCount;
+      for (int handle = 0; handle<max; handle++)
      {
-        if (channel.GetPosition(this.subListIndex) == -1 && !channel.IsDeleted)
+        var channel = (ChannelInfo) this.gviewRight.GetRow(handle);
+        if (channel != null && channel.GetPosition(this.subListIndex) == -1 && !channel.IsDeleted)
          channel.SetPosition(this.subListIndex, maxNr++);
      }
+
      this.gviewRight.EndDataUpdate();
      this.gviewLeft.EndDataUpdate();
    }
@@ -1090,7 +1107,7 @@ namespace ChanSort.Ui
        this.splitContainerControl1.SplitterPosition = width;
      this.SelectLanguageMenuItem();

-      this.SetGridLayout(this.gviewLeft, Settings.Default.OutputListLayout);
+      //this.SetGridLayout(this.gviewLeft, Settings.Default.OutputListLayout);

      this.miShowWarningsAfterLoad.Checked = Settings.Default.ShowWarningsAfterLoading;
      this.cbCloseGap.Checked = Settings.Default.CloseGaps;
@@ -1266,13 +1283,18 @@ namespace ChanSort.Ui
      this.gviewRight.BeginSort();
      this.gviewRight.ClearColumnsFilter();
      this.colSlotOld.FilterInfo = new ColumnFilterInfo("[OldProgramNr]<>-1");
+      if (this.subListIndex > 0)
+        this.colPrNr.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1");
      this.gviewRight.EndSort();
    }
    #endregion

    #region LoadInputGridLayout()
-    private void LoadInputGridLayout(ChannelList list)
+    private void LoadInputGridLayout()
    {
+#if false
+      // code disabled because it causes unpredictable column order when working with different file formats which may of may not show columns
+
      string newLayout;
      var newSource = list.SignalSource;
      if ((newSource & SignalSource.Analog) != 0)
@@ -1283,16 +1305,22 @@ namespace ChanSort.Ui
        newLayout = Settings.Default.InputGridLayoutDvbCT;
      if (!string.IsNullOrEmpty(newLayout))
        this.SetGridLayout(this.gviewRight, newLayout);
-      
-      foreach (GridColumn col in this.gviewRight.Columns)
-        col.Visible = GetGridColumnVisibility(col, list);
-      foreach (GridColumn col in this.gviewLeft.Columns)
-        col.Visible = GetGridColumnVisibility(col, list);
-
+#endif
+      this.ShowGridColumns(this.gviewLeft);
+      this.ShowGridColumns(this.gviewRight);
      this.ClearRightFilter();
    }
    #endregion

+    #region ShowGridColumns()
+    private void ShowGridColumns(GridView gview)
+    {
+      int visIndex = 0;
+      foreach (GridColumn col in gview.Columns)
+        col.VisibleIndex = GetGridColumnVisibility(col) ? visIndex++ : -1;
+    }
+    #endregion
+
    #region SaveInputGridLayout()
    private void SaveInputGridLayout(SignalSource signalSource)
    {
@@ -1308,13 +1336,16 @@ namespace ChanSort.Ui

    #region GetGridColumnVisibility()

-    private bool GetGridColumnVisibility(GridColumn col, ChannelList list)
+    private bool GetGridColumnVisibility(GridColumn col)
    {
+      var list = this.currentChannelList;
      var filter = list.VisibleColumnFieldNames;
      if (filter != null && !filter.Contains(col.FieldName))
        return false;

      var source = list.SignalSource;
+      if (col == this.colSource) return list.IsMixedSourceFavoritesList;
+      if (col == this.colPrNr) return this.subListIndex > 0;
      if (col == this.colChannelOrTransponder) return (source & SignalSource.Sat) == 0;
      if (col == this.colShortName) return (source & SignalSource.Digital) != 0;
      if (col == this.colEncrypted) return (source & SignalSource.Digital) != 0;
@@ -2020,14 +2051,16 @@ namespace ChanSort.Ui
    private void tabSubList_SelectedPageChanged(object sender, TabPageChangedEventArgs e)
    {
      this.subListIndex = this.tabSubList.SelectedTabPageIndex;
+      this.ShowGridColumns(this.gviewRight);
+
      this.editor.SubListIndex = this.subListIndex;
      this.gviewLeft.BeginSort();
      this.gviewLeft.EndSort();
      this.gviewRight.BeginSort();
      if (this.subListIndex > 0)
-        this.colSlotNew.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1");
+        this.colPrNr.FilterInfo = new ColumnFilterInfo("[NewProgramNr]<>-1");
      else
-        this.colSlotNew.ClearFilter();     
+        this.colPrNr.ClearFilter();     
      this.gviewRight.EndSort();
    }
    #endregion
@@ -2038,6 +2071,8 @@ namespace ChanSort.Ui
      var channel = (ChannelInfo) e.Row;
      if (e.Column.FieldName == "Position")
        e.Value = channel.GetPosition(this.subListIndex);
+      else if (e.Column.FieldName == "OldPosition")
+        e.Value = channel.GetOldPosition(this.subListIndex);
    }
    #endregion

@@ -2407,7 +2442,7 @@ namespace ChanSort.Ui
    #region gviewRight_CustomColumnDisplayText
    private void gviewRight_CustomColumnDisplayText(object sender, CustomColumnDisplayTextEventArgs e)
    {
-      if (e.Column == this.colSlotNew)
+      if (e.Column == this.colSlotNew || e.Column == this.colSlotOld || e.Column == this.colPrNr)
      {
        if (!(e.Value is int)) return;
        if ((int) e.Value == -1)
--- a/source/ChanSort/MainForm.de.resx
+++ b/source/ChanSort/MainForm.de.resx
@@ -124,154 +124,91 @@
    <value>Service Typ</value>
  </data>
  <data name="colOutSlot.Caption" xml:space="preserve">
-    <value>Neue Pr#</value>
+    <value>Neue Pos</value>
  </data>
-  <data name="miOpen.Caption" xml:space="preserve">
-    <value>TV Senderliste &amp;öffnen...</value>
+  <data name="colOutSlot.ToolTip" xml:space="preserve">
+    <value>Neue Position</value>
  </data>
-  <data name="miPrint.Caption" xml:space="preserve">
-    <value>&amp;Drucken...</value>
+  <data name="colOutName.Caption" xml:space="preserve">
+    <value>Sendername</value>
  </data>
-  <data name="mnuFavSet.Caption" xml:space="preserve">
-    <value>&amp;Favoriten hinzufügen</value>
+  <data name="colOutFav.Caption" xml:space="preserve">
+    <value>Favoriten</value>
  </data>
-  <data name="mnuGotoFavList.Caption" xml:space="preserve">
-    <value>Program-/&amp;Favoritenliste auswählen</value>
+  <data name="colOutLock.Caption" xml:space="preserve">
+    <value>Ge- sperrt</value>
+  </data>
+  <data name="colOutLock.ToolTip" xml:space="preserve">
+    <value>Kindersicherung</value>
+  </data>
+  <data name="colOutSkip.Caption" xml:space="preserve">
+    <value>Über- springen</value>
+  </data>
+  <data name="miRenameChannel.Caption" xml:space="preserve">
+    <value>Sender umbenennen</value>
+  </data>
+  <data name="miMoveDown.Caption" xml:space="preserve">
+    <value>Nach unten</value>
+  </data>
+  <data name="rbInsertBefore.Properties.Caption" xml:space="preserve">
+    <value>davor</value>
+  </data>
+  <data name="cbCloseGap.Properties.Caption" xml:space="preserve">
+    <value>Lücken beim Verschieben/Entfernen von Sendern schließen</value>
+  </data>
+  <data name="cbCloseGap.ToolTip" xml:space="preserve">
+    <value>Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt</value>
+  </data>
+  <data name="lblInsertMode.Text" xml:space="preserve">
+    <value>Einfügemodus:</value>
+  </data>
+  <data name="pageEmpty.Text" xml:space="preserve">
+    <value>Keine Senderlisten vorhanden</value>
+  </data>
+  <data name="lblSetProgramNr.Text" xml:space="preserve">
+    <value>Setze Pr#:</value>
+  </data>
+  <data name="lblSetProgramNr.ToolTip" xml:space="preserve">
+    <value>Programplatz für Einfügen und Festlegen</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>ChanSort {0} - Editor für TV-Senderlisten</value>
+  </data>
+  <data name="btnToggleLock.Text" xml:space="preserve">
+    <value>Kindersicherung bei markierten Sendern ein/ausschalten</value>
  </data>
  <data name="grpInputList.Text" xml:space="preserve">
    <value>Alle Sender</value>
  </data>
-  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
-    <value>tauschen</value>
+  <data name="btnAdd.ToolTip" xml:space="preserve">
+    <value>Markierte Sender in die sortierte liste übernehmen</value>
  </data>
-  <data name="btnToggleFavC.AccessibleDescription" xml:space="preserve">
-    <value>Favorit C umschalten</value>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>Markierte Sender in die sortierte liste übernehmen</value>
  </data>
-  <data name="btnToggleFavB.AccessibleDescription" xml:space="preserve">
-    <value>Favorit B umschalten</value>
-  </data>
-  <data name="btnToggleFavA.AccessibleDescription" xml:space="preserve">
-    <value>Favorit A umschalten</value>
-  </data>
-  <data name="btnClearLeftFilter.AccessibleDescription" xml:space="preserve">
-    <value>Entfernt den Suchfilter von der sortierten Senderliste</value>
-  </data>
-  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
+  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
    <value>Filter entfernen</value>
  </data>
-  <data name="btnRenum.Text" xml:space="preserve">
-    <value>Markierte Sender fortlaufend nummerieren</value>
+  <data name="btnClearRightFilter.Text" xml:space="preserve">
+    <value>FIlter</value>
  </data>
-  <data name="btnRenum.ToolTip" xml:space="preserve">
-    <value>Markierte Sender fortlaufend nummerieren</value>
+  <data name="btnClearRightFilter.AccessibleDescription" xml:space="preserve">
+    <value>Entfernt den Suchfilter von der vollständigen Senderliste</value>
  </data>
-  <data name="btnDown.Text" xml:space="preserve">
-    <value>Markierte Sender nach unten verschieben</value>
+  <data name="btnAddAll.ToolTip" xml:space="preserve">
+    <value>Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen</value>
  </data>
-  <data name="btnDown.ToolTip" xml:space="preserve">
-    <value>Markierte Sender nach unten verschieben</value>
+  <data name="btnAddAll.Text" xml:space="preserve">
+    <value>&lt;&lt; Alle hinzufügen</value>
  </data>
-  <data name="btnUp.Text" xml:space="preserve">
-    <value>Markierte Sender nach oben verschieben</value>
+  <data name="btnAddAll.AccessibleDescription" xml:space="preserve">
+    <value>Alle derzeit angezeigte, nicht sortierte Sender ans Ende der Liste anhängen</value>
  </data>
-  <data name="btnUp.ToolTip" xml:space="preserve">
-    <value>Markierte Sender nach oben verschieben</value>
+  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
+    <value>Sender aus sortierter Liste entfernen</value>
  </data>
-  <data name="btnRemoveLeft.Text" xml:space="preserve">
-    <value>Markierte Sender aus sortierter Liste entfernen</value>
-  </data>
-  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
-    <value>Markierte Sender aus sortierter Liste entfernen</value>
-  </data>
-  <data name="grpOutputList.Text" xml:space="preserve">
-    <value>Sortierte Sender</value>
-  </data>
-  <data name="colIndex.Caption" xml:space="preserve">
-    <value>Pr. Index</value>
-  </data>
-  <data name="colSlotOld.Caption" xml:space="preserve">
-    <value>Alte Pr#</value>
-  </data>
-  <data name="colSlotOld.ToolTip" xml:space="preserve">
-    <value>Alter Programmplatz</value>
-  </data>
-  <data name="colSlotNew.Caption" xml:space="preserve">
-    <value>Neue Pr#</value>
-  </data>
-  <data name="colSlotNew.ToolTip" xml:space="preserve">
-    <value>Neuer Programmplatz</value>
-  </data>
-  <data name="colName.Caption" xml:space="preserve">
-    <value>Sendername</value>
-  </data>
-  <data name="colShortName.Caption" xml:space="preserve">
-    <value>Kurzname</value>
-  </data>
-  <data name="colFavorites.Caption" xml:space="preserve">
-    <value>Favoriten</value>
-  </data>
-  <data name="colLock.Caption" xml:space="preserve">
-    <value>Ge- sperrt</value>
-  </data>
-  <data name="colSkip.Caption" xml:space="preserve">
-    <value>Über- springen</value>
-  </data>
-  <data name="colHidden.Caption" xml:space="preserve">
-    <value>Ver- steckt</value>
-  </data>
-  <data name="colEncrypted.Caption" xml:space="preserve">
-    <value>Ver- schlüss</value>
-  </data>
-  <data name="colEncrypted.ToolTip" xml:space="preserve">
-    <value>Verschlüsselt</value>
-  </data>
-  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
-    <value>Kanal/ Transp.</value>
-  </data>
-  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
-    <value>Kanal- bzw. Transpondernummer</value>
-  </data>
-  <data name="colFreqInMhz.Caption" xml:space="preserve">
-    <value>Frequenz (MHz)</value>
-  </data>
-  <data name="colServiceType.Caption" xml:space="preserve">
-    <value>Service Typ ID</value>
-  </data>
-  <data name="colServiceTypeName.Caption" xml:space="preserve">
-    <value>Service Typ</value>
-  </data>
-  <data name="colSatellite.Caption" xml:space="preserve">
-    <value>Satellit</value>
-  </data>
-  <data name="colNetworkId.Caption" xml:space="preserve">
-    <value>Netzwerk (ONID)</value>
-  </data>
-  <data name="colSymbolRate.Caption" xml:space="preserve">
-    <value>Symbol- rate</value>
-  </data>
-  <data name="colPolarity.Caption" xml:space="preserve">
-    <value>Polarität</value>
-  </data>
-  <data name="colNetworkName.Caption" xml:space="preserve">
-    <value>Netzwerk Name</value>
-  </data>
-  <data name="colNetworkOperator.Caption" xml:space="preserve">
-    <value>Netzwerk Betreiber</value>
-  </data>
-  <data name="colProvider.Caption" xml:space="preserve">
-    <value>Anbieter</value>
-  </data>
-  <data name="colLogicalIndex.Caption" xml:space="preserve">
-    <value>Reihenfolge</value>
-  </data>
-  <data name="colSignalSource.Caption" xml:space="preserve">
-    <value>Signal- quelle</value>
-  </data>
-  <data name="lblHotkeyRight.Text" xml:space="preserve">
-    <value>F5: Filter | F6: Liste | Eingabe: übernehmen</value>
-  </data>
-  <data name="lblPredefinedList.Text" xml:space="preserve">
-    <value>Diese vorprogrammierte Liste kann nicht bearbeitet werden.</value>
+  <data name="btnRemoveRight.Text" xml:space="preserve">
+    <value>Sender aus sortierter Liste entfernen</value>
  </data>
  <data name="lblPredefinedList.ToolTip" xml:space="preserve">
    <value>Bei der Einrichtung ihres TVs wurde eine vordefinierte Senderliste gewählt.
@@ -279,35 +216,296 @@ Das Ändern dieser Liste würde zu Fehlfunktionen des Geräts führen.
 Führen Sie bitte einen Sender-Vollsuchlauf aus und wählen Sie dabei keine
 speziellen Anbieter, Satelliten oder Länderlisten aus.</value>
  </data>
-  <data name="btnRemoveRight.Text" xml:space="preserve">
-    <value>Sender aus sortierter Liste entfernen</value>
+  <data name="lblPredefinedList.Text" xml:space="preserve">
+    <value>Diese vorprogrammierte Liste kann nicht bearbeitet werden.</value>
  </data>
-  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
-    <value>Sender aus sortierter Liste entfernen</value>
+  <data name="lblHotkeyRight.Text" xml:space="preserve">
+    <value>F5: Filter | F6: Liste | Eingabe: übernehmen</value>
  </data>
-  <data name="btnAddAll.AccessibleDescription" xml:space="preserve">
-    <value>Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen</value>
+  <data name="colSignalSource.Caption" xml:space="preserve">
+    <value>Signal- quelle</value>
  </data>
-  <data name="btnAddAll.Text" xml:space="preserve">
-    <value>&lt;&lt; Alle hinzufügen</value>
+  <data name="colLogicalIndex.Caption" xml:space="preserve">
+    <value>Reihenfolge</value>
  </data>
-  <data name="btnAddAll.ToolTip" xml:space="preserve">
-    <value>Aller derzeit nicht sortierten Sender ans Ende der Liste anhängen</value>
+  <data name="colProvider.Caption" xml:space="preserve">
+    <value>Anbieter</value>
  </data>
-  <data name="btnClearRightFilter.AccessibleDescription" xml:space="preserve">
-    <value>Entfernt den Suchfilter von der vollständigen Senderliste</value>
+  <data name="colNetworkOperator.Caption" xml:space="preserve">
+    <value>Netzwerk Betreiber</value>
  </data>
-  <data name="btnClearRightFilter.Text" xml:space="preserve">
-    <value>FIlter</value>
+  <data name="colNetworkName.Caption" xml:space="preserve">
+    <value>Netzwerk Name</value>
  </data>
-  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
+  <data name="colPolarity.Caption" xml:space="preserve">
+    <value>Polarität</value>
+  </data>
+  <data name="colSymbolRate.Caption" xml:space="preserve">
+    <value>Symbol- rate</value>
+  </data>
+  <data name="colNetworkId.Caption" xml:space="preserve">
+    <value>Netzwerk (ONID)</value>
+  </data>
+  <data name="colSatellite.Caption" xml:space="preserve">
+    <value>Satellit</value>
+  </data>
+  <data name="colServiceTypeName.Caption" xml:space="preserve">
+    <value>Service Typ</value>
+  </data>
+  <data name="colServiceType.Caption" xml:space="preserve">
+    <value>Service Typ ID</value>
+  </data>
+  <data name="colFreqInMhz.Caption" xml:space="preserve">
+    <value>Frequenz (MHz)</value>
+  </data>
+  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
+    <value>Kanal- bzw. Transpondernummer</value>
+  </data>
+  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
+    <value>Kanal/ Transp.</value>
+  </data>
+  <data name="colEncrypted.ToolTip" xml:space="preserve">
+    <value>Verschlüsselt</value>
+  </data>
+  <data name="colEncrypted.Caption" xml:space="preserve">
+    <value>Ver- schlüss</value>
+  </data>
+  <data name="colHidden.Caption" xml:space="preserve">
+    <value>Ver- steckt</value>
+  </data>
+  <data name="colSkip.Caption" xml:space="preserve">
+    <value>Über- springen</value>
+  </data>
+  <data name="colLock.Caption" xml:space="preserve">
+    <value>Ge- sperrt</value>
+  </data>
+  <data name="colFavorites.Caption" xml:space="preserve">
+    <value>Favoriten</value>
+  </data>
+  <data name="colShortName.Caption" xml:space="preserve">
+    <value>Kurzname</value>
+  </data>
+  <data name="colName.Caption" xml:space="preserve">
+    <value>Sendername</value>
+  </data>
+  <data name="colSlotNew.ToolTip" xml:space="preserve">
+    <value>Neue Position</value>
+  </data>
+  <data name="colSlotNew.Caption" xml:space="preserve">
+    <value>Neue Pos</value>
+  </data>
+  <data name="colSlotOld.ToolTip" xml:space="preserve">
+    <value>Alte Position</value>
+  </data>
+  <data name="colSlotOld.Caption" xml:space="preserve">
+    <value>Alte Pos</value>
+  </data>
+  <data name="colIndex.Caption" xml:space="preserve">
+    <value>Pr. Index</value>
+  </data>
+  <data name="grpOutputList.Text" xml:space="preserve">
+    <value>Sortierte Sender</value>
+  </data>
+  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
+    <value>Markierte Sender aus sortierter Liste entfernen</value>
+  </data>
+  <data name="btnRemoveLeft.Text" xml:space="preserve">
+    <value>Markierte Sender aus sortierter Liste entfernen</value>
+  </data>
+  <data name="btnUp.ToolTip" xml:space="preserve">
+    <value>Markierte Sender nach oben verschieben</value>
+  </data>
+  <data name="btnUp.Text" xml:space="preserve">
+    <value>Markierte Sender nach oben verschieben</value>
+  </data>
+  <data name="btnDown.ToolTip" xml:space="preserve">
+    <value>Markierte Sender nach unten verschieben</value>
+  </data>
+  <data name="btnDown.Text" xml:space="preserve">
+    <value>Markierte Sender nach unten verschieben</value>
+  </data>
+  <data name="btnRenum.ToolTip" xml:space="preserve">
+    <value>Markierte Sender fortlaufend nummerieren</value>
+  </data>
+  <data name="btnRenum.Text" xml:space="preserve">
+    <value>Markierte Sender fortlaufend nummerieren</value>
+  </data>
+  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
    <value>Filter entfernen</value>
  </data>
-  <data name="btnAdd.Text" xml:space="preserve">
-    <value>Markierte Sender in die sortierte liste übernehmen</value>
+  <data name="btnClearLeftFilter.AccessibleDescription" xml:space="preserve">
+    <value>Entfernt den Suchfilter von der sortierten Senderliste</value>
  </data>
-  <data name="btnAdd.ToolTip" xml:space="preserve">
-    <value>Markierte Sender in die sortierte liste übernehmen</value>
+  <data name="btnToggleFavA.AccessibleDescription" xml:space="preserve">
+    <value>Favorit A umschalten</value>
+  </data>
+  <data name="btnToggleFavB.AccessibleDescription" xml:space="preserve">
+    <value>Favorit B umschalten</value>
+  </data>
+  <data name="btnToggleFavC.AccessibleDescription" xml:space="preserve">
+    <value>Favorit C umschalten</value>
+  </data>
+  <data name="btnToggleFavD.AccessibleDescription" xml:space="preserve">
+    <value>Favorit D umschalten</value>
+  </data>
+  <data name="btnToggleFavE.AccessibleDescription" xml:space="preserve">
+    <value>Favorit E umschalten</value>
+  </data>
+  <data name="btnToggleLock.ToolTip" xml:space="preserve">
+    <value>Kindersicherung</value>
+  </data>
+  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
+    <value>dahinter</value>
+  </data>
+  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
+    <value>tauschen</value>
+  </data>
+  <data name="mnuGotoFavList.Caption" xml:space="preserve">
+    <value>Program-/&amp;Favoritenliste auswählen</value>
+  </data>
+  <data name="mnuGotoFavList.AccessibleDescription" xml:space="preserve">
+    <value>Öffnet ein Menü zur Auswahl der Programm- oder Favoritenliste. Dieses Menü kann auch direkt über die Umschalt+F1 Tastenkombination geöffnet werden.</value>
+  </data>
+  <data name="mnuGotoChannelList.Caption" xml:space="preserve">
+    <value>&amp;Eingangsquelle auswählen</value>
+  </data>
+  <data name="mnuGotoChannelList.AccessibleDescription" xml:space="preserve">
+    <value>Öffnet ein Menü zur Auswahl der Eingangsquelle. Dieses kann auch direkt mit der F1-Taste aufgerufen werden.</value>
+  </data>
+  <data name="mnuAccessibility.Caption" xml:space="preserve">
+    <value>Einga&amp;behilfe</value>
+  </data>
+  <data name="miAllowEditPredefinedLists.Hint" xml:space="preserve">
+    <value>Der Fernseher funktioniert dabei unter Umständen nicht mehr korrekt.</value>
+  </data>
+  <data name="miAllowEditPredefinedLists.Caption" xml:space="preserve">
+    <value>Bearbeiten vordefinierter Listen erlauben (GEFÄHRLICH)</value>
+  </data>
+  <data name="miShowWarningsAfterLoad.Hint" xml:space="preserve">
+    <value>Eventuelle Warnungen nach dem Laden einer TV-Datei automatisch anzeigen</value>
+  </data>
+  <data name="miShowWarningsAfterLoad.Caption" xml:space="preserve">
+    <value>Warnungen beim Laden anzeigen</value>
+  </data>
+  <data name="miIsoCharSets.Caption" xml:space="preserve">
+    <value>ISO Zeichensätze</value>
+  </data>
+  <data name="miCharsetForm.Caption" xml:space="preserve">
+    <value>Alle Zeichensätze...</value>
+  </data>
+  <data name="mnuCharset.Caption" xml:space="preserve">
+    <value>&amp;Zeichensatz</value>
+  </data>
+  <data name="barSubItem1.Caption" xml:space="preserve">
+    <value>&amp;Sprache</value>
+  </data>
+  <data name="mnuOptions.Caption" xml:space="preserve">
+    <value>&amp;Einstellungen</value>
+  </data>
+  <data name="miCleanupChannels.Hint" xml:space="preserve">
+    <value>Senderdatensätze neu organisieren und Duplikate entfernen</value>
+  </data>
+  <data name="miCleanupChannels.Caption" xml:space="preserve">
+    <value>Senderliste bereinigen</value>
+  </data>
+  <data name="miTvSettings.Caption" xml:space="preserve">
+    <value>Geräte&amp;einstellungen...</value>
+  </data>
+  <data name="barSubItem2.Caption" xml:space="preserve">
+    <value>TV-Gerät</value>
+  </data>
+  <data name="miHideOff.Caption" xml:space="preserve">
+    <value>Sender verstecken: aus</value>
+  </data>
+  <data name="miHideOn.Caption" xml:space="preserve">
+    <value>Sender &amp;verstecken: ein</value>
+  </data>
+  <data name="miSkipOff.Caption" xml:space="preserve">
+    <value>Sender überspringen: aus</value>
+  </data>
+  <data name="miSkipOn.Caption" xml:space="preserve">
+    <value>Sender ü&amp;berspringen: ein</value>
+  </data>
+  <data name="miLockOff.Caption" xml:space="preserve">
+    <value>Sender sperren: aus</value>
+  </data>
+  <data name="miLockOn.Caption" xml:space="preserve">
+    <value>Sender s&amp;perren: ein</value>
+  </data>
+  <data name="mnuFavUnset.Caption" xml:space="preserve">
+    <value>Favoriten entfernen</value>
+  </data>
+  <data name="mnuFavSet.Caption" xml:space="preserve">
+    <value>&amp;Favoriten hinzufügen</value>
+  </data>
+  <data name="miRenumFavByPrNr.Hint" xml:space="preserve">
+    <value>Verwendet einheitlich die Pr# auch in allen Favoritenlisten</value>
+  </data>
+  <data name="miRenumFavByPrNr.Caption" xml:space="preserve">
+    <value>Favoriten nach Pr# nummerieren</value>
+  </data>
+  <data name="miRenum.Caption" xml:space="preserve">
+    <value>Sender neu &amp;nummerieren</value>
+  </data>
+  <data name="miSort.Caption" xml:space="preserve">
+    <value>Sender alphabetisch sortieren</value>
+  </data>
+  <data name="miRemove.Caption" xml:space="preserve">
+    <value>Sender &amp;entfernen</value>
+  </data>
+  <data name="miAddChannel.Caption" xml:space="preserve">
+    <value>Sender &amp;übernehmen</value>
+  </data>
+  <data name="miEdit.Caption" xml:space="preserve">
+    <value>&amp;Bearbeiten</value>
+  </data>
+  <data name="miRecentFiles.Caption" xml:space="preserve">
+    <value>Zuletzt verwendet</value>
+  </data>
+  <data name="miQuit.Caption" xml:space="preserve">
+    <value>&amp;Beenden</value>
+  </data>
+  <data name="miPrint.Caption" xml:space="preserve">
+    <value>&amp;Drucken...</value>
+  </data>
+  <data name="miExcelExport.Caption" xml:space="preserve">
+    <value>Excel liste exportieren...</value>
+  </data>
+  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
+    <value>Referenzliste speichern...</value>
+  </data>
+  <data name="miAddFromRefList.Caption" xml:space="preserve">
+    <value>Sender aus Referenzliste hinzufügen...</value>
+  </data>
+  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
+    <value>Referenzliste öffnen...</value>
+  </data>
+  <data name="miSaveAs.Caption" xml:space="preserve">
+    <value>Speichern &amp;unter...</value>
+  </data>
+  <data name="miSave.Caption" xml:space="preserve">
+    <value>&amp;Speichern</value>
+  </data>
+  <data name="miFileInformation.Caption" xml:space="preserve">
+    <value>Datei&amp;information...</value>
+  </data>
+  <data name="miRestoreOriginal.Caption" xml:space="preserve">
+    <value>Sicherheitskopie wiederherstellen</value>
+  </data>
+  <data name="miReload.Caption" xml:space="preserve">
+    <value>&amp;Erneut laden</value>
+  </data>
+  <data name="miOpen.Caption" xml:space="preserve">
+    <value>TV Senderliste &amp;öffnen...</value>
+  </data>
+  <data name="miFile.Caption" xml:space="preserve">
+    <value>&amp;Datei</value>
+  </data>
+  <data name="lblHotkeyLeft.Text" xml:space="preserve">
+    <value>F3: Filter | F4: Liste | -: nach oben | +: nach unten | Entf: entfernen</value>
+  </data>
+  <data name="colOutHide.Caption" xml:space="preserve">
+    <value>Ver- steckt</value>
  </data>
  <data name="miSelectFavList0.Caption" xml:space="preserve">
    <value>Programmliste</value>
@@ -354,204 +552,6 @@ speziellen Anbieter, Satelliten oder Länderlisten aus.</value>
  <data name="miMoveUp.Caption" xml:space="preserve">
    <value>Nach oben</value>
  </data>
-  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
-    <value>dahinter</value>
-  </data>
-  <data name="btnToggleLock.ToolTip" xml:space="preserve">
-    <value>Kindersicherung</value>
-  </data>
-  <data name="btnToggleFavE.AccessibleDescription" xml:space="preserve">
-    <value>Favorit E umschalten</value>
-  </data>
-  <data name="btnToggleFavD.AccessibleDescription" xml:space="preserve">
-    <value>Favorit D umschalten</value>
-  </data>
-  <data name="mnuFavUnset.Caption" xml:space="preserve">
-    <value>Favoriten entfernen</value>
-  </data>
-  <data name="miLockOn.Caption" xml:space="preserve">
-    <value>Sender s&amp;perren: ein</value>
-  </data>
-  <data name="miLockOff.Caption" xml:space="preserve">
-    <value>Sender sperren: aus</value>
-  </data>
-  <data name="miSkipOn.Caption" xml:space="preserve">
-    <value>Sender ü&amp;berspringen: ein</value>
-  </data>
-  <data name="miSkipOff.Caption" xml:space="preserve">
-    <value>Sender überspringen: aus</value>
-  </data>
-  <data name="miHideOn.Caption" xml:space="preserve">
-    <value>Sender &amp;verstecken: ein</value>
-  </data>
-  <data name="miHideOff.Caption" xml:space="preserve">
-    <value>Sender verstecken: aus</value>
-  </data>
-  <data name="barSubItem2.Caption" xml:space="preserve">
-    <value>TV-Gerät</value>
-  </data>
-  <data name="miTvSettings.Caption" xml:space="preserve">
-    <value>Geräte&amp;einstellungen...</value>
-  </data>
-  <data name="miCleanupChannels.Caption" xml:space="preserve">
-    <value>Senderliste bereinigen</value>
-  </data>
-  <data name="miCleanupChannels.Hint" xml:space="preserve">
-    <value>Senderdatensätze neu organisieren und Duplikate entfernen</value>
-  </data>
-  <data name="mnuOptions.Caption" xml:space="preserve">
-    <value>&amp;Einstellungen</value>
-  </data>
-  <data name="barSubItem1.Caption" xml:space="preserve">
-    <value>&amp;Sprache</value>
-  </data>
-  <data name="mnuCharset.Caption" xml:space="preserve">
-    <value>&amp;Zeichensatz</value>
-  </data>
-  <data name="miCharsetForm.Caption" xml:space="preserve">
-    <value>Alle Zeichensätze...</value>
-  </data>
-  <data name="miIsoCharSets.Caption" xml:space="preserve">
-    <value>ISO Zeichensätze</value>
-  </data>
-  <data name="miShowWarningsAfterLoad.Caption" xml:space="preserve">
-    <value>Warnungen beim Laden anzeigen</value>
-  </data>
-  <data name="miShowWarningsAfterLoad.Hint" xml:space="preserve">
-    <value>Eventuelle Warnungen nach dem Laden einer TV-Datei automatisch anzeigen</value>
-  </data>
-  <data name="miAllowEditPredefinedLists.Caption" xml:space="preserve">
-    <value>Bearbeiten vordefinierter Listen erlauben (GEFÄHRLICH)</value>
-  </data>
-  <data name="miAllowEditPredefinedLists.Hint" xml:space="preserve">
-    <value>Der Fernseher funktioniert dabei unter Umständen nicht mehr korrekt.</value>
-  </data>
-  <data name="mnuAccessibility.Caption" xml:space="preserve">
-    <value>Einga&amp;behilfe</value>
-  </data>
-  <data name="mnuGotoChannelList.AccessibleDescription" xml:space="preserve">
-    <value>Öffnet ein Menü zur Auswahl der Eingangsquelle. Dieses kann auch direkt mit der F1-Taste aufgerufen werden.</value>
-  </data>
-  <data name="mnuGotoChannelList.Caption" xml:space="preserve">
-    <value>&amp;Eingangsquelle auswählen</value>
-  </data>
-  <data name="mnuGotoFavList.AccessibleDescription" xml:space="preserve">
-    <value>Öffnet ein Menü zur Auswahl der Programm- oder Favoritenliste. Dieses Menü kann auch direkt über die Umschalt+F1 Tastenkombination geöffnet werden.</value>
-  </data>
-  <data name="miQuit.Caption" xml:space="preserve">
-    <value>&amp;Beenden</value>
-  </data>
-  <data name="miRecentFiles.Caption" xml:space="preserve">
-    <value>Zuletzt verwendet</value>
-  </data>
-  <data name="miEdit.Caption" xml:space="preserve">
-    <value>&amp;Bearbeiten</value>
-  </data>
-  <data name="miAddChannel.Caption" xml:space="preserve">
-    <value>Sender &amp;übernehmen</value>
-  </data>
-  <data name="miRemove.Caption" xml:space="preserve">
-    <value>Sender &amp;entfernen</value>
-  </data>
-  <data name="miSort.Caption" xml:space="preserve">
-    <value>Sender alphabetisch sortieren</value>
-  </data>
-  <data name="miRenum.Caption" xml:space="preserve">
-    <value>Sender neu &amp;nummerieren</value>
-  </data>
-  <data name="miRenumFavByPrNr.Caption" xml:space="preserve">
-    <value>Favoriten nach Pr# nummerieren</value>
-  </data>
-  <data name="miRenumFavByPrNr.Hint" xml:space="preserve">
-    <value>Verwendet einheitlich die Pr# auch in allen Favoritenlisten</value>
-  </data>
-  <data name="miReload.Caption" xml:space="preserve">
-    <value>&amp;Erneut laden</value>
-  </data>
-  <data name="miRestoreOriginal.Caption" xml:space="preserve">
-    <value>Sicherheitskopie wiederherstellen</value>
-  </data>
-  <data name="miFileInformation.Caption" xml:space="preserve">
-    <value>Datei&amp;information...</value>
-  </data>
-  <data name="miSave.Caption" xml:space="preserve">
-    <value>&amp;Speichern</value>
-  </data>
-  <data name="miSaveAs.Caption" xml:space="preserve">
-    <value>Speichern &amp;unter...</value>
-  </data>
-  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
-    <value>Referenzliste öffnen...</value>
-  </data>
-  <data name="miAddFromRefList.Caption" xml:space="preserve">
-    <value>Sender aus Referenzliste hinzufügen...</value>
-  </data>
-  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
-    <value>Referenzliste speichern...</value>
-  </data>
-  <data name="miExcelExport.Caption" xml:space="preserve">
-    <value>Excel liste exportieren...</value>
-  </data>
-  <data name="colOutSlot.ToolTip" xml:space="preserve">
-    <value>Neuer Programmplatz</value>
-  </data>
-  <data name="colOutName.Caption" xml:space="preserve">
-    <value>Sendername</value>
-  </data>
-  <data name="colOutFav.Caption" xml:space="preserve">
-    <value>Favoriten</value>
-  </data>
-  <data name="colOutLock.Caption" xml:space="preserve">
-    <value>Ge- sperrt</value>
-  </data>
-  <data name="colOutLock.ToolTip" xml:space="preserve">
-    <value>Kindersicherung</value>
-  </data>
-  <data name="colOutHide.Caption" xml:space="preserve">
-    <value>Ver- steckt</value>
-  </data>
-  <data name="lblHotkeyLeft.Text" xml:space="preserve">
-    <value>F3: Filter | F4: Liste | -: nach oben | +: nach unten | Entf: entfernen</value>
-  </data>
-  <data name="miFile.Caption" xml:space="preserve">
-    <value>&amp;Datei</value>
-  </data>
-  <data name="colOutSkip.Caption" xml:space="preserve">
-    <value>Über- springen</value>
-  </data>
-  <data name="miRenameChannel.Caption" xml:space="preserve">
-    <value>Sender umbenennen</value>
-  </data>
-  <data name="miMoveDown.Caption" xml:space="preserve">
-    <value>Nach unten</value>
-  </data>
-  <data name="rbInsertBefore.Properties.Caption" xml:space="preserve">
-    <value>davor</value>
-  </data>
-  <data name="cbCloseGap.Properties.Caption" xml:space="preserve">
-    <value>Lücken beim Verschieben/Entfernen von Sendern schließen</value>
-  </data>
-  <data name="cbCloseGap.ToolTip" xml:space="preserve">
-    <value>Wenn aktiv, werden folgende Programmnummer automatisch vorgerückt</value>
-  </data>
-  <data name="lblInsertMode.Text" xml:space="preserve">
-    <value>Einfügemodus:</value>
-  </data>
-  <data name="pageEmpty.Text" xml:space="preserve">
-    <value>Keine Senderlisten vorhanden</value>
-  </data>
-  <data name="lblSetProgramNr.Text" xml:space="preserve">
-    <value>Setze Pr#:</value>
-  </data>
-  <data name="lblSetProgramNr.ToolTip" xml:space="preserve">
-    <value>Programplatz für Einfügen und Festlegen</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>ChanSort {0} - Editor für TV-Senderlisten</value>
-  </data>
-  <data name="btnToggleLock.Text" xml:space="preserve">
-    <value>Kindersicherung bei markierten Sendern ein/ausschalten</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="lblHotkeyLeft.Size" type="System.Drawing.Size, System.Drawing">
    <value>333, 17</value>
@@ -625,4 +625,7 @@ speziellen Anbieter, Satelliten oder Länderlisten aus.</value>
  <data name="lblPredefinedList.Size" type="System.Drawing.Size, System.Drawing">
    <value>495, 19</value>
  </data>
+  <data name="colSource.Caption" xml:space="preserve">
+    <value>Quelle</value>
+  </data>
 </root>
--- a/source/ChanSort/MainForm.pt.resx
+++ b/source/ChanSort/MainForm.pt.resx
@@ -66,214 +66,7 @@
  <assembly alias="DevExpress.XtraEditors.v15.2" name="DevExpress.XtraEditors.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="colOutSlot.Caption" xml:space="preserve">
-    <value>Novo Pr#</value>
-  </data>
-  <data name="miOpen.Caption" xml:space="preserve">
-    <value>Abrir &amp;lista de canais...</value>
-  </data>
-  <data name="mnuFavSet.Caption" xml:space="preserve">
-    <value>&amp;Acrescentar favoritos</value>
-  </data>
-  <data name="grpInputList.Text" xml:space="preserve">
-    <value>Todos os canais</value>
-  </data>
-  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
-    <value>Comutar</value>
-  </data>
-  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
-    <value>Repor filtro</value>
-  </data>
-  <data name="btnRenum.ToolTip" xml:space="preserve">
-    <value>Renumerar canais seleccionados</value>
-  </data>
-  <data name="btnDown.ToolTip" xml:space="preserve">
-    <value>Mover canais seleccionados para baixo</value>
-  </data>
-  <data name="btnUp.ToolTip" xml:space="preserve">
-    <value>Mover canais seleccionados para cima</value>
-  </data>
-  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
-    <value>Remover canais seleccionados</value>
-  </data>
-  <data name="grpOutputList.Text" xml:space="preserve">
-    <value>Canais ordenados</value>
-  </data>
-  <data name="colSlotOld.Caption" xml:space="preserve">
-    <value>Valor Pr# anterior</value>
-  </data>
-  <data name="colSlotOld.ToolTip" xml:space="preserve">
-    <value>Posição de canal anterior Programmplatz</value>
-  </data>
-  <data name="colSlotNew.Caption" xml:space="preserve">
-    <value>Novo Pr#</value>
-  </data>
-  <data name="colSlotNew.ToolTip" xml:space="preserve">
-    <value>Posição de canal novo</value>
-  </data>
-  <data name="colName.Caption" xml:space="preserve">
-    <value>Nome do canal</value>
-  </data>
-  <data name="colShortName.Caption" xml:space="preserve">
-    <value>Abreviatura</value>
-  </data>
-  <data name="colFavorites.Caption" xml:space="preserve">
-    <value>Favoritos</value>
-  </data>
-  <data name="colLock.Caption" xml:space="preserve">
-    <value>Blo- queado</value>
-  </data>
-  <data name="colSkip.Caption" xml:space="preserve">
-    <value>Sal- tar</value>
-  </data>
-  <data name="colHidden.Caption" xml:space="preserve">
-    <value>Esc- onder</value>
-  </data>
-  <data name="colEncrypted.Caption" xml:space="preserve">
-    <value>Cod- ificado</value>
-  </data>
-  <data name="colEncrypted.ToolTip" xml:space="preserve">
-    <value>Codificado</value>
-  </data>
-  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
-    <value>Canal/ Transp.</value>
-  </data>
-  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
-    <value>Número de canal ou transponder</value>
-  </data>
-  <data name="colFreqInMhz.Caption" xml:space="preserve">
-    <value>Frequência (MHz)</value>
-  </data>
-  <data name="colServiceId.Caption" xml:space="preserve">
-    <value>Sserviço ID</value>
-  </data>
-  <data name="colServiceType.Caption" xml:space="preserve">
-    <value>Tipo serviço ID</value>
-  </data>
-  <data name="colServiceTypeName.Caption" xml:space="preserve">
-    <value>Tipo serviço</value>
-  </data>
-  <data name="colSatellite.Caption" xml:space="preserve">
-    <value>Sátelite</value>
-  </data>
-  <data name="colSymbolRate.Caption" xml:space="preserve">
-    <value>Taxa de- símbolo</value>
-  </data>
-  <data name="colPolarity.Caption" xml:space="preserve">
-    <value>Polaridade</value>
-  </data>
-  <data name="colNetworkName.Caption" xml:space="preserve">
-    <value>Nome da rede</value>
-  </data>
-  <data name="colNetworkOperator.Caption" xml:space="preserve">
-    <value>Operador</value>
-  </data>
-  <data name="lblHotkeyRight.Text" xml:space="preserve">
-    <value>F5: Filtro | F6: Lista | Entrada: aceitar</value>
-  </data>
-  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
-    <value>Remover canais seleccionados</value>
-  </data>
-  <data name="btnAddAll.Text" xml:space="preserve">
-    <value>&lt;&lt; Acrescentar todos</value>
-  </data>
-  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
-    <value>Repor filtro</value>
-  </data>
-  <data name="btnAdd.ToolTip" xml:space="preserve">
-    <value>Aceitar canais assinalados</value>
-  </data>
-  <data name="mnuHelp.Caption" xml:space="preserve">
-    <value>&amp;Ajuda</value>
-  </data>
-  <data name="miAbout.Caption" xml:space="preserve">
-    <value>&amp;Sobre ChanSort...</value>
-  </data>
-  <data name="miMoveUp.Caption" xml:space="preserve">
-    <value>Para cima</value>
-  </data>
-  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
-    <value>Depois</value>
-  </data>
-  <data name="btnToggleLock.ToolTip" xml:space="preserve">
-    <value>Parental lock</value>
-  </data>
-  <data name="mnuFavUnset.Caption" xml:space="preserve">
-    <value>Remover favoritos</value>
-  </data>
-  <data name="miLockOn.Caption" xml:space="preserve">
-    <value>Bloquear &amp;canais: SIM</value>
-  </data>
-  <data name="miLockOff.Caption" xml:space="preserve">
-    <value>Bloquear canais: NÃO</value>
-  </data>
-  <data name="miSkipOn.Caption" xml:space="preserve">
-    <value>Saltar &amp;canais: SIM</value>
-  </data>
-  <data name="miSkipOff.Caption" xml:space="preserve">
-    <value>Saltar canais: NÃO</value>
-  </data>
-  <data name="miHideOn.Caption" xml:space="preserve">
-    <value>Esconder &amp;canais: SIM</value>
-  </data>
-  <data name="miHideOff.Caption" xml:space="preserve">
-    <value>Esconder canais: NÃO</value>
-  </data>
-  <data name="barSubItem2.Caption" xml:space="preserve">
-    <value>Televisor</value>
-  </data>
-  <data name="miTvSettings.Caption" xml:space="preserve">
-    <value>Configurações TV...</value>
-  </data>
-  <data name="mnuOptions.Caption" xml:space="preserve">
-    <value>&amp;Configurações</value>
-  </data>
-  <data name="barSubItem1.Caption" xml:space="preserve">
-    <value>&amp;Idioma</value>
-  </data>
-  <data name="mnuCharset.Caption" xml:space="preserve">
-    <value>&amp;Tabela de caracteres</value>
-  </data>
-  <data name="miQuit.Caption" xml:space="preserve">
-    <value>&amp;Terminar</value>
-  </data>
-  <data name="miEdit.Caption" xml:space="preserve">
-    <value>&amp;Editar</value>
-  </data>
-  <data name="miAddChannel.Caption" xml:space="preserve">
-    <value>Aceitar &amp;canal</value>
-  </data>
-  <data name="miRemove.Caption" xml:space="preserve">
-    <value>Remover &amp;canal</value>
-  </data>
-  <data name="miSort.Caption" xml:space="preserve">
-    <value>Ordenar canais alfabeticamente</value>
-  </data>
-  <data name="miRenum.Caption" xml:space="preserve">
-    <value>Renumerar &amp;canais de novo</value>
-  </data>
-  <data name="miReload.Caption" xml:space="preserve">
-    <value>&amp;Recarregar</value>
-  </data>
-  <data name="miRestoreOriginal.Caption" xml:space="preserve">
-    <value>Repor cópia de segurança</value>
-  </data>
-  <data name="miFileInformation.Caption" xml:space="preserve">
-    <value>Informações&amp; do ficheiro...</value>
-  </data>
-  <data name="miSave.Caption" xml:space="preserve">
-    <value>&amp;Gravar</value>
-  </data>
-  <data name="miSaveAs.Caption" xml:space="preserve">
-    <value>Gravar &amp;como...</value>
-  </data>
-  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
-    <value>Abrir lista de referência...</value>
-  </data>
-  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
-    <value>Gravar lista de referência...</value>
-  </data>
-  <data name="miExcelExport.Caption" xml:space="preserve">
-    <value>Exportar lista de Excel...</value>
+    <value>Novo Pos</value>
  </data>
  <data name="colOutSlot.ToolTip" xml:space="preserve">
    <value>Posição de canal novo</value>
@@ -290,15 +83,6 @@
  <data name="colOutLock.ToolTip" xml:space="preserve">
    <value>Parental lock</value>
  </data>
-  <data name="colOutHide.Caption" xml:space="preserve">
-    <value>Esc- onder</value>
-  </data>
-  <data name="lblHotkeyLeft.Text" xml:space="preserve">
-    <value>F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover</value>
-  </data>
-  <data name="miFile.Caption" xml:space="preserve">
-    <value>&amp;Ficheiro</value>
-  </data>
  <data name="colOutSkip.Caption" xml:space="preserve">
    <value>Sal- tar</value>
  </data>
@@ -326,6 +110,222 @@
  <data name="$this.Text" xml:space="preserve">
    <value>ChanSort {0} - Editor de listas de canais para televisores Samsung, LG, Panasonic e Toshiba</value>
  </data>
+  <data name="grpInputList.Text" xml:space="preserve">
+    <value>Todos os canais</value>
+  </data>
+  <data name="btnAdd.ToolTip" xml:space="preserve">
+    <value>Aceitar canais assinalados</value>
+  </data>
+  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
+    <value>Repor filtro</value>
+  </data>
+  <data name="btnAddAll.Text" xml:space="preserve">
+    <value>&lt;&lt; Acrescentar todos</value>
+  </data>
+  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
+    <value>Remover canais seleccionados</value>
+  </data>
+  <data name="lblHotkeyRight.Text" xml:space="preserve">
+    <value>F5: Filtro | F6: Lista | Entrada: aceitar</value>
+  </data>
+  <data name="colNetworkOperator.Caption" xml:space="preserve">
+    <value>Operador</value>
+  </data>
+  <data name="colNetworkName.Caption" xml:space="preserve">
+    <value>Nome da rede</value>
+  </data>
+  <data name="colPolarity.Caption" xml:space="preserve">
+    <value>Polaridade</value>
+  </data>
+  <data name="colSymbolRate.Caption" xml:space="preserve">
+    <value>Taxa de- símbolo</value>
+  </data>
+  <data name="colSatellite.Caption" xml:space="preserve">
+    <value>Sátelite</value>
+  </data>
+  <data name="colServiceTypeName.Caption" xml:space="preserve">
+    <value>Tipo serviço</value>
+  </data>
+  <data name="colServiceType.Caption" xml:space="preserve">
+    <value>Tipo serviço ID</value>
+  </data>
+  <data name="colServiceId.Caption" xml:space="preserve">
+    <value>Sserviço ID</value>
+  </data>
+  <data name="colFreqInMhz.Caption" xml:space="preserve">
+    <value>Frequência (MHz)</value>
+  </data>
+  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
+    <value>Número de canal ou transponder</value>
+  </data>
+  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
+    <value>Canal/ Transp.</value>
+  </data>
+  <data name="colEncrypted.ToolTip" xml:space="preserve">
+    <value>Codificado</value>
+  </data>
+  <data name="colEncrypted.Caption" xml:space="preserve">
+    <value>Cod- ificado</value>
+  </data>
+  <data name="colHidden.Caption" xml:space="preserve">
+    <value>Esc- onder</value>
+  </data>
+  <data name="colSkip.Caption" xml:space="preserve">
+    <value>Sal- tar</value>
+  </data>
+  <data name="colLock.Caption" xml:space="preserve">
+    <value>Blo- queado</value>
+  </data>
+  <data name="colFavorites.Caption" xml:space="preserve">
+    <value>Favoritos</value>
+  </data>
+  <data name="colShortName.Caption" xml:space="preserve">
+    <value>Abreviatura</value>
+  </data>
+  <data name="colName.Caption" xml:space="preserve">
+    <value>Nome do canal</value>
+  </data>
+  <data name="colSlotNew.ToolTip" xml:space="preserve">
+    <value>Posição de canal novo</value>
+  </data>
+  <data name="colSlotNew.Caption" xml:space="preserve">
+    <value>Novo Pos</value>
+  </data>
+  <data name="colSlotOld.ToolTip" xml:space="preserve">
+    <value>Posição de canal anterior Programmplatz</value>
+  </data>
+  <data name="colSlotOld.Caption" xml:space="preserve">
+    <value>Valor Pr# anterior</value>
+  </data>
+  <data name="grpOutputList.Text" xml:space="preserve">
+    <value>Canais ordenados</value>
+  </data>
+  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
+    <value>Remover canais seleccionados</value>
+  </data>
+  <data name="btnUp.ToolTip" xml:space="preserve">
+    <value>Mover canais seleccionados para cima</value>
+  </data>
+  <data name="btnDown.ToolTip" xml:space="preserve">
+    <value>Mover canais seleccionados para baixo</value>
+  </data>
+  <data name="btnRenum.ToolTip" xml:space="preserve">
+    <value>Renumerar canais seleccionados</value>
+  </data>
+  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
+    <value>Repor filtro</value>
+  </data>
+  <data name="btnToggleLock.ToolTip" xml:space="preserve">
+    <value>Parental lock</value>
+  </data>
+  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
+    <value>Depois</value>
+  </data>
+  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
+    <value>Comutar</value>
+  </data>
+  <data name="mnuCharset.Caption" xml:space="preserve">
+    <value>&amp;Tabela de caracteres</value>
+  </data>
+  <data name="barSubItem1.Caption" xml:space="preserve">
+    <value>&amp;Idioma</value>
+  </data>
+  <data name="mnuOptions.Caption" xml:space="preserve">
+    <value>&amp;Configurações</value>
+  </data>
+  <data name="miTvSettings.Caption" xml:space="preserve">
+    <value>Configurações TV...</value>
+  </data>
+  <data name="barSubItem2.Caption" xml:space="preserve">
+    <value>Televisor</value>
+  </data>
+  <data name="miHideOff.Caption" xml:space="preserve">
+    <value>Esconder canais: NÃO</value>
+  </data>
+  <data name="miHideOn.Caption" xml:space="preserve">
+    <value>Esconder &amp;canais: SIM</value>
+  </data>
+  <data name="miSkipOff.Caption" xml:space="preserve">
+    <value>Saltar canais: NÃO</value>
+  </data>
+  <data name="miSkipOn.Caption" xml:space="preserve">
+    <value>Saltar &amp;canais: SIM</value>
+  </data>
+  <data name="miLockOff.Caption" xml:space="preserve">
+    <value>Bloquear canais: NÃO</value>
+  </data>
+  <data name="miLockOn.Caption" xml:space="preserve">
+    <value>Bloquear &amp;canais: SIM</value>
+  </data>
+  <data name="mnuFavUnset.Caption" xml:space="preserve">
+    <value>Remover favoritos</value>
+  </data>
+  <data name="mnuFavSet.Caption" xml:space="preserve">
+    <value>&amp;Acrescentar favoritos</value>
+  </data>
+  <data name="miRenum.Caption" xml:space="preserve">
+    <value>Renumerar &amp;canais de novo</value>
+  </data>
+  <data name="miSort.Caption" xml:space="preserve">
+    <value>Ordenar canais alfabeticamente</value>
+  </data>
+  <data name="miRemove.Caption" xml:space="preserve">
+    <value>Remover &amp;canal</value>
+  </data>
+  <data name="miAddChannel.Caption" xml:space="preserve">
+    <value>Aceitar &amp;canal</value>
+  </data>
+  <data name="miEdit.Caption" xml:space="preserve">
+    <value>&amp;Editar</value>
+  </data>
+  <data name="miQuit.Caption" xml:space="preserve">
+    <value>&amp;Terminar</value>
+  </data>
+  <data name="miExcelExport.Caption" xml:space="preserve">
+    <value>Exportar lista de Excel...</value>
+  </data>
+  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
+    <value>Gravar lista de referência...</value>
+  </data>
+  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
+    <value>Abrir lista de referência...</value>
+  </data>
+  <data name="miSaveAs.Caption" xml:space="preserve">
+    <value>Gravar &amp;como...</value>
+  </data>
+  <data name="miSave.Caption" xml:space="preserve">
+    <value>&amp;Gravar</value>
+  </data>
+  <data name="miFileInformation.Caption" xml:space="preserve">
+    <value>Informações&amp; do ficheiro...</value>
+  </data>
+  <data name="miRestoreOriginal.Caption" xml:space="preserve">
+    <value>Repor cópia de segurança</value>
+  </data>
+  <data name="miReload.Caption" xml:space="preserve">
+    <value>&amp;Recarregar</value>
+  </data>
+  <data name="miOpen.Caption" xml:space="preserve">
+    <value>Abrir &amp;lista de canais...</value>
+  </data>
+  <data name="miFile.Caption" xml:space="preserve">
+    <value>&amp;Ficheiro</value>
+  </data>
+  <data name="lblHotkeyLeft.Text" xml:space="preserve">
+    <value>F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover</value>
+  </data>
+  <data name="colOutHide.Caption" xml:space="preserve">
+    <value>Esc- onder</value>
+  </data>
+  <data name="mnuHelp.Caption" xml:space="preserve">
+    <value>&amp;Ajuda</value>
+  </data>
+  <data name="miAbout.Caption" xml:space="preserve">
+    <value>&amp;Sobre ChanSort...</value>
+  </data>
+  <data name="miMoveUp.Caption" xml:space="preserve">
+    <value>Para cima</value>
+  </data>
  <data name="colOutServiceType.Caption" xml:space="preserve">
    <value>Tipo serviço</value>
  </data>
--- a/source/ChanSort/MainForm.resx
+++ b/source/ChanSort/MainForm.resx
--- a/source/ChanSort/MainForm.ru.resx
+++ b/source/ChanSort/MainForm.ru.resx
@@ -120,288 +120,6 @@
  <data name="colOutSlot.Caption" xml:space="preserve">
    <value>Новый</value>
  </data>
-  <data name="miOpen.Caption" xml:space="preserve">
-    <value>Открыть файл данных TV...</value>
-  </data>
-  <data name="mnuFavSet.Caption" xml:space="preserve">
-    <value>Добавить в Избранное</value>
-  </data>
-  <data name="grpInputList.Text" xml:space="preserve">
-    <value>Все каналы</value>
-  </data>
-  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
-    <value>заменить</value>
-  </data>
-  <data name="btnClearLeftFilter.Text" xml:space="preserve">
-    <value>Фильтр</value>
-  </data>
-  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
-    <value>Сбросить фильтр</value>
-  </data>
-  <data name="btnRenum.Text" xml:space="preserve">
-    <value>1-999</value>
-  </data>
-  <data name="btnRenum.ToolTip" xml:space="preserve">
-    <value>Изменить нумерацию выбранных каналов</value>
-  </data>
-  <data name="btnDown.Text" xml:space="preserve">
-    <value>v</value>
-  </data>
-  <data name="btnDown.ToolTip" xml:space="preserve">
-    <value>Переместить выбранные каналы вниз</value>
-  </data>
-  <data name="btnUp.Text" xml:space="preserve">
-    <value>^</value>
-  </data>
-  <data name="btnUp.ToolTip" xml:space="preserve">
-    <value>Переместить выбранные каналы вверх</value>
-  </data>
-  <data name="btnRemoveLeft.Text" xml:space="preserve">
-    <value>X</value>
-  </data>
-  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
-    <value>Удалить выбранные каналы</value>
-  </data>
-  <data name="grpOutputList.Text" xml:space="preserve">
-    <value>Отсортированные каналы</value>
-  </data>
-  <data name="colIndex.Caption" xml:space="preserve">
-    <value>Индекс пр.</value>
-  </data>
-  <data name="colSlotOld.Caption" xml:space="preserve">
-    <value>Старый</value>
-  </data>
-  <data name="colSlotOld.ToolTip" xml:space="preserve">
-    <value>Старый номер программы</value>
-  </data>
-  <data name="colSlotNew.Caption" xml:space="preserve">
-    <value>Новый</value>
-  </data>
-  <data name="colSlotNew.ToolTip" xml:space="preserve">
-    <value>Новый номер программы</value>
-  </data>
-  <data name="colName.Caption" xml:space="preserve">
-    <value>Название канала</value>
-  </data>
-  <data name="colShortName.Caption" xml:space="preserve">
-    <value>Краткое имя</value>
-  </data>
-  <data name="colFavorites.Caption" xml:space="preserve">
-    <value>Избранное</value>
-  </data>
-  <data name="colLock.Caption" xml:space="preserve">
-    <value>Заблокированный</value>
-  </data>
-  <data name="colSkip.Caption" xml:space="preserve">
-    <value>Пропускать</value>
-  </data>
-  <data name="colHidden.Caption" xml:space="preserve">
-    <value>Скрыть</value>
-  </data>
-  <data name="colEncrypted.Caption" xml:space="preserve">
-    <value>Зашифрованный</value>
-  </data>
-  <data name="colEncrypted.ToolTip" xml:space="preserve">
-    <value>Зашифрованный</value>
-  </data>
-  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
-    <value>Канал/Транспондер</value>
-  </data>
-  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
-    <value>Номер канала или транспондер</value>
-  </data>
-  <data name="colFreqInMhz.Caption" xml:space="preserve">
-    <value>Частота (MHz)</value>
-  </data>
-  <data name="colServiceId.Caption" xml:space="preserve">
-    <value>ID сервиса</value>
-  </data>
-  <data name="colVideoPid.Caption" xml:space="preserve">
-    <value>Видео PID</value>
-  </data>
-  <data name="colAudioPid.Caption" xml:space="preserve">
-    <value>Аудио PID</value>
-  </data>
-  <data name="colServiceType.Caption" xml:space="preserve">
-    <value>ID Тип сервиса</value>
-  </data>
-  <data name="colServiceTypeName.Caption" xml:space="preserve">
-    <value>Тип сервиса</value>
-  </data>
-  <data name="colSatellite.Caption" xml:space="preserve">
-    <value>Спутник</value>
-  </data>
-  <data name="colNetworkId.Caption" xml:space="preserve">
-    <value>Сеть (ONID)</value>
-  </data>
-  <data name="colTransportStreamId.ToolTip" xml:space="preserve">
-    <value>ID транспортного потока</value>
-  </data>
-  <data name="colSymbolRate.Caption" xml:space="preserve">
-    <value>Скорость передачи</value>
-  </data>
-  <data name="colPolarity.Caption" xml:space="preserve">
-    <value>Полярность</value>
-  </data>
-  <data name="colNetworkName.Caption" xml:space="preserve">
-    <value>Сетевое имя</value>
-  </data>
-  <data name="colNetworkOperator.Caption" xml:space="preserve">
-    <value>Оператор сети</value>
-  </data>
-  <data name="colLogicalIndex.Caption" xml:space="preserve">
-    <value>Order</value>
-  </data>
-  <data name="colSignalSource.Caption" xml:space="preserve">
-    <value>Источник сигнала</value>
-  </data>
-  <data name="lblHotkeyRight.Text" xml:space="preserve">
-    <value>F5: Фильтр | F6: Список | Enter: Добавить</value>
-  </data>
-  <data name="btnRemoveRight.Text" xml:space="preserve">
-    <value>X</value>
-  </data>
-  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
-    <value>Удалить выбранные каналы из отсортированного списка</value>
-  </data>
-  <data name="btnAddAll.Text" xml:space="preserve">
-    <value>&lt;&lt; Добавить все</value>
-  </data>
-  <data name="btnAddAll.ToolTip" xml:space="preserve">
-    <value>Добавить все текущие несортированные каналы в конец списка</value>
-  </data>
-  <data name="btnClearRightFilter.Text" xml:space="preserve">
-    <value>Фильтр</value>
-  </data>
-  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
-    <value>Сбросить фильтр</value>
-  </data>
-  <data name="btnAdd.Text" xml:space="preserve">
-    <value>&lt;&lt;</value>
-  </data>
-  <data name="btnAdd.ToolTip" xml:space="preserve">
-    <value>Добавить выбранные каналы в отсортированный список</value>
-  </data>
-  <data name="mnuHelp.Caption" xml:space="preserve">
-    <value>Помощь</value>
-  </data>
-  <data name="miWiki.Caption" xml:space="preserve">
-    <value>Вики ChanSort</value>
-  </data>
-  <data name="miOpenWebsite.Caption" xml:space="preserve">
-    <value>Сайт ChanSort...</value>
-  </data>
-  <data name="miAbout.Caption" xml:space="preserve">
-    <value>О ChanSort ...</value>
-  </data>
-  <data name="bar1.Text" xml:space="preserve">
-    <value>Инструменты</value>
-  </data>
-  <data name="miMoveUp.Caption" xml:space="preserve">
-    <value>Переместить вверх</value>
-  </data>
-  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
-    <value>после</value>
-  </data>
-  <data name="btnToggleLock.ToolTip" xml:space="preserve">
-    <value>Родительский контроль</value>
-  </data>
-  <data name="mnuFavUnset.Caption" xml:space="preserve">
-    <value>Удалить из Избранного</value>
-  </data>
-  <data name="miLockOn.Caption" xml:space="preserve">
-    <value>Заблокировать канал</value>
-  </data>
-  <data name="miLockOff.Caption" xml:space="preserve">
-    <value>Разблокировать канал</value>
-  </data>
-  <data name="miSkipOn.Caption" xml:space="preserve">
-    <value>Пропустить канал</value>
-  </data>
-  <data name="miSkipOff.Caption" xml:space="preserve">
-    <value>Не пропускать канал</value>
-  </data>
-  <data name="miHideOn.Caption" xml:space="preserve">
-    <value>Скрыть канал</value>
-  </data>
-  <data name="miHideOff.Caption" xml:space="preserve">
-    <value>Показать канал</value>
-  </data>
-  <data name="barSubItem2.Caption" xml:space="preserve">
-    <value>Телевизор</value>
-  </data>
-  <data name="miTvSettings.Caption" xml:space="preserve">
-    <value>Настройка устройства...</value>
-  </data>
-  <data name="miCleanupChannels.Caption" xml:space="preserve">
-    <value>Очистка данных канала</value>
-  </data>
-  <data name="miCleanupChannels.Hint" xml:space="preserve">
-    <value>Перенастроить канал и удалить дубликаты</value>
-  </data>
-  <data name="mnuOptions.Caption" xml:space="preserve">
-    <value>Настройки</value>
-  </data>
-  <data name="barSubItem1.Caption" xml:space="preserve">
-    <value>Язык</value>
-  </data>
-  <data name="mnuCharset.Caption" xml:space="preserve">
-    <value>Набор символов</value>
-  </data>
-  <data name="miCharsetForm.Caption" xml:space="preserve">
-    <value>Все наборы символов...</value>
-  </data>
-  <data name="miShowWarningsAfterLoad.Caption" xml:space="preserve">
-    <value>Показывать предупреждения после загрузки файла</value>
-  </data>
-  <data name="miQuit.Caption" xml:space="preserve">
-    <value>Выход</value>
-  </data>
-  <data name="miRecentFiles.Caption" xml:space="preserve">
-    <value>Последние файлы</value>
-  </data>
-  <data name="miEdit.Caption" xml:space="preserve">
-    <value>Правка</value>
-  </data>
-  <data name="miAddChannel.Caption" xml:space="preserve">
-    <value>Добавить каналы</value>
-  </data>
-  <data name="miRemove.Caption" xml:space="preserve">
-    <value>Удалить каналы</value>
-  </data>
-  <data name="miSort.Caption" xml:space="preserve">
-    <value>Сортировать каналы по алфавиту</value>
-  </data>
-  <data name="miRenum.Caption" xml:space="preserve">
-    <value>Изменить нумерацию каналов</value>
-  </data>
-  <data name="miReload.Caption" xml:space="preserve">
-    <value>Перезагрузить</value>
-  </data>
-  <data name="miRestoreOriginal.Caption" xml:space="preserve">
-    <value>Восстановить из резервной копии</value>
-  </data>
-  <data name="miFileInformation.Caption" xml:space="preserve">
-    <value>Файл и информация...</value>
-  </data>
-  <data name="miSave.Caption" xml:space="preserve">
-    <value>Сохранить</value>
-  </data>
-  <data name="miSaveAs.Caption" xml:space="preserve">
-    <value>Сохранить как...</value>
-  </data>
-  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
-    <value>Загрузить список...</value>
-  </data>
-  <data name="miAddFromRefList.Caption" xml:space="preserve">
-    <value>Добавить каналы из списка...</value>
-  </data>
-  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
-    <value>Сохранить список...</value>
-  </data>
-  <data name="miExcelExport.Caption" xml:space="preserve">
-    <value>Экспорт в Excel...</value>
-  </data>
  <data name="colOutSlot.ToolTip" xml:space="preserve">
    <value>Новый номер программы</value>
  </data>
@@ -417,18 +135,6 @@
  <data name="colOutLock.ToolTip" xml:space="preserve">
    <value>Родительский контроль</value>
  </data>
-  <data name="colOutHide.Caption" xml:space="preserve">
-    <value>Скрыть</value>
-  </data>
-  <data name="lblHotkeyLeft.Text" xml:space="preserve">
-    <value>F3: Фильтр | F4: Список | -: Вверх | +: Вниз | Del: Удалить</value>
-  </data>
-  <data name="pageProgNr.Text" xml:space="preserve">
-    <value>Pr#</value>
-  </data>
-  <data name="miFile.Caption" xml:space="preserve">
-    <value>Файл</value>
-  </data>
  <data name="colOutSkip.Caption" xml:space="preserve">
    <value>Пропускать</value>
  </data>
@@ -462,6 +168,300 @@
  <data name="$this.Text" xml:space="preserve">
    <value>ChanSort {0} - редактор списка каналов для телевизоров Samsung, LG, Pansonic и Toshiba</value>
  </data>
+  <data name="grpInputList.Text" xml:space="preserve">
+    <value>Все каналы</value>
+  </data>
+  <data name="btnAdd.ToolTip" xml:space="preserve">
+    <value>Добавить выбранные каналы в отсортированный список</value>
+  </data>
+  <data name="btnAdd.Text" xml:space="preserve">
+    <value>&lt;&lt;</value>
+  </data>
+  <data name="btnClearRightFilter.ToolTip" xml:space="preserve">
+    <value>Сбросить фильтр</value>
+  </data>
+  <data name="btnClearRightFilter.Text" xml:space="preserve">
+    <value>Фильтр</value>
+  </data>
+  <data name="btnAddAll.ToolTip" xml:space="preserve">
+    <value>Добавить все текущие несортированные каналы в конец списка</value>
+  </data>
+  <data name="btnAddAll.Text" xml:space="preserve">
+    <value>&lt;&lt; Добавить все</value>
+  </data>
+  <data name="btnRemoveRight.ToolTip" xml:space="preserve">
+    <value>Удалить выбранные каналы из отсортированного списка</value>
+  </data>
+  <data name="btnRemoveRight.Text" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="lblHotkeyRight.Text" xml:space="preserve">
+    <value>F5: Фильтр | F6: Список | Enter: Добавить</value>
+  </data>
+  <data name="colSignalSource.Caption" xml:space="preserve">
+    <value>Источник сигнала</value>
+  </data>
+  <data name="colLogicalIndex.Caption" xml:space="preserve">
+    <value>Order</value>
+  </data>
+  <data name="colNetworkOperator.Caption" xml:space="preserve">
+    <value>Оператор сети</value>
+  </data>
+  <data name="colNetworkName.Caption" xml:space="preserve">
+    <value>Сетевое имя</value>
+  </data>
+  <data name="colPolarity.Caption" xml:space="preserve">
+    <value>Полярность</value>
+  </data>
+  <data name="colSymbolRate.Caption" xml:space="preserve">
+    <value>Скорость передачи</value>
+  </data>
+  <data name="colTransportStreamId.ToolTip" xml:space="preserve">
+    <value>ID транспортного потока</value>
+  </data>
+  <data name="colNetworkId.Caption" xml:space="preserve">
+    <value>Сеть (ONID)</value>
+  </data>
+  <data name="colSatellite.Caption" xml:space="preserve">
+    <value>Спутник</value>
+  </data>
+  <data name="colServiceTypeName.Caption" xml:space="preserve">
+    <value>Тип сервиса</value>
+  </data>
+  <data name="colServiceType.Caption" xml:space="preserve">
+    <value>ID Тип сервиса</value>
+  </data>
+  <data name="colAudioPid.Caption" xml:space="preserve">
+    <value>Аудио PID</value>
+  </data>
+  <data name="colVideoPid.Caption" xml:space="preserve">
+    <value>Видео PID</value>
+  </data>
+  <data name="colServiceId.Caption" xml:space="preserve">
+    <value>ID сервиса</value>
+  </data>
+  <data name="colFreqInMhz.Caption" xml:space="preserve">
+    <value>Частота (MHz)</value>
+  </data>
+  <data name="colChannelOrTransponder.ToolTip" xml:space="preserve">
+    <value>Номер канала или транспондер</value>
+  </data>
+  <data name="colChannelOrTransponder.Caption" xml:space="preserve">
+    <value>Канал/Транспондер</value>
+  </data>
+  <data name="colEncrypted.ToolTip" xml:space="preserve">
+    <value>Зашифрованный</value>
+  </data>
+  <data name="colEncrypted.Caption" xml:space="preserve">
+    <value>Зашифрованный</value>
+  </data>
+  <data name="colHidden.Caption" xml:space="preserve">
+    <value>Скрыть</value>
+  </data>
+  <data name="colSkip.Caption" xml:space="preserve">
+    <value>Пропускать</value>
+  </data>
+  <data name="colLock.Caption" xml:space="preserve">
+    <value>Заблокированный</value>
+  </data>
+  <data name="colFavorites.Caption" xml:space="preserve">
+    <value>Избранное</value>
+  </data>
+  <data name="colShortName.Caption" xml:space="preserve">
+    <value>Краткое имя</value>
+  </data>
+  <data name="colName.Caption" xml:space="preserve">
+    <value>Название канала</value>
+  </data>
+  <data name="colSlotNew.ToolTip" xml:space="preserve">
+    <value>Новый номер программы</value>
+  </data>
+  <data name="colSlotNew.Caption" xml:space="preserve">
+    <value>Новый</value>
+  </data>
+  <data name="colSlotOld.ToolTip" xml:space="preserve">
+    <value>Старый номер программы</value>
+  </data>
+  <data name="colSlotOld.Caption" xml:space="preserve">
+    <value>Старый</value>
+  </data>
+  <data name="colIndex.Caption" xml:space="preserve">
+    <value>Индекс пр.</value>
+  </data>
+  <data name="grpOutputList.Text" xml:space="preserve">
+    <value>Отсортированные каналы</value>
+  </data>
+  <data name="btnRemoveLeft.ToolTip" xml:space="preserve">
+    <value>Удалить выбранные каналы</value>
+  </data>
+  <data name="btnRemoveLeft.Text" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="btnUp.ToolTip" xml:space="preserve">
+    <value>Переместить выбранные каналы вверх</value>
+  </data>
+  <data name="btnUp.Text" xml:space="preserve">
+    <value>^</value>
+  </data>
+  <data name="btnDown.ToolTip" xml:space="preserve">
+    <value>Переместить выбранные каналы вниз</value>
+  </data>
+  <data name="btnDown.Text" xml:space="preserve">
+    <value>v</value>
+  </data>
+  <data name="btnRenum.ToolTip" xml:space="preserve">
+    <value>Изменить нумерацию выбранных каналов</value>
+  </data>
+  <data name="btnRenum.Text" xml:space="preserve">
+    <value>1-999</value>
+  </data>
+  <data name="btnClearLeftFilter.ToolTip" xml:space="preserve">
+    <value>Сбросить фильтр</value>
+  </data>
+  <data name="btnClearLeftFilter.Text" xml:space="preserve">
+    <value>Фильтр</value>
+  </data>
+  <data name="btnToggleLock.ToolTip" xml:space="preserve">
+    <value>Родительский контроль</value>
+  </data>
+  <data name="rbInsertAfter.Properties.Caption" xml:space="preserve">
+    <value>после</value>
+  </data>
+  <data name="rbInsertSwap.Properties.Caption" xml:space="preserve">
+    <value>заменить</value>
+  </data>
+  <data name="miShowWarningsAfterLoad.Caption" xml:space="preserve">
+    <value>Показывать предупреждения после загрузки файла</value>
+  </data>
+  <data name="miCharsetForm.Caption" xml:space="preserve">
+    <value>Все наборы символов...</value>
+  </data>
+  <data name="mnuCharset.Caption" xml:space="preserve">
+    <value>Набор символов</value>
+  </data>
+  <data name="barSubItem1.Caption" xml:space="preserve">
+    <value>Язык</value>
+  </data>
+  <data name="mnuOptions.Caption" xml:space="preserve">
+    <value>Настройки</value>
+  </data>
+  <data name="miCleanupChannels.Hint" xml:space="preserve">
+    <value>Перенастроить канал и удалить дубликаты</value>
+  </data>
+  <data name="miCleanupChannels.Caption" xml:space="preserve">
+    <value>Очистка данных канала</value>
+  </data>
+  <data name="miTvSettings.Caption" xml:space="preserve">
+    <value>Настройка устройства...</value>
+  </data>
+  <data name="barSubItem2.Caption" xml:space="preserve">
+    <value>Телевизор</value>
+  </data>
+  <data name="miHideOff.Caption" xml:space="preserve">
+    <value>Показать канал</value>
+  </data>
+  <data name="miHideOn.Caption" xml:space="preserve">
+    <value>Скрыть канал</value>
+  </data>
+  <data name="miSkipOff.Caption" xml:space="preserve">
+    <value>Не пропускать канал</value>
+  </data>
+  <data name="miSkipOn.Caption" xml:space="preserve">
+    <value>Пропустить канал</value>
+  </data>
+  <data name="miLockOff.Caption" xml:space="preserve">
+    <value>Разблокировать канал</value>
+  </data>
+  <data name="miLockOn.Caption" xml:space="preserve">
+    <value>Заблокировать канал</value>
+  </data>
+  <data name="mnuFavUnset.Caption" xml:space="preserve">
+    <value>Удалить из Избранного</value>
+  </data>
+  <data name="mnuFavSet.Caption" xml:space="preserve">
+    <value>Добавить в Избранное</value>
+  </data>
+  <data name="miRenum.Caption" xml:space="preserve">
+    <value>Изменить нумерацию каналов</value>
+  </data>
+  <data name="miSort.Caption" xml:space="preserve">
+    <value>Сортировать каналы по алфавиту</value>
+  </data>
+  <data name="miRemove.Caption" xml:space="preserve">
+    <value>Удалить каналы</value>
+  </data>
+  <data name="miAddChannel.Caption" xml:space="preserve">
+    <value>Добавить каналы</value>
+  </data>
+  <data name="miEdit.Caption" xml:space="preserve">
+    <value>Правка</value>
+  </data>
+  <data name="miRecentFiles.Caption" xml:space="preserve">
+    <value>Последние файлы</value>
+  </data>
+  <data name="miQuit.Caption" xml:space="preserve">
+    <value>Выход</value>
+  </data>
+  <data name="miExcelExport.Caption" xml:space="preserve">
+    <value>Экспорт в Excel...</value>
+  </data>
+  <data name="miSaveReferenceFile.Caption" xml:space="preserve">
+    <value>Сохранить список...</value>
+  </data>
+  <data name="miAddFromRefList.Caption" xml:space="preserve">
+    <value>Добавить каналы из списка...</value>
+  </data>
+  <data name="miOpenReferenceFile.Caption" xml:space="preserve">
+    <value>Загрузить список...</value>
+  </data>
+  <data name="miSaveAs.Caption" xml:space="preserve">
+    <value>Сохранить как...</value>
+  </data>
+  <data name="miSave.Caption" xml:space="preserve">
+    <value>Сохранить</value>
+  </data>
+  <data name="miFileInformation.Caption" xml:space="preserve">
+    <value>Файл и информация...</value>
+  </data>
+  <data name="miRestoreOriginal.Caption" xml:space="preserve">
+    <value>Восстановить из резервной копии</value>
+  </data>
+  <data name="miReload.Caption" xml:space="preserve">
+    <value>Перезагрузить</value>
+  </data>
+  <data name="miOpen.Caption" xml:space="preserve">
+    <value>Открыть файл данных TV...</value>
+  </data>
+  <data name="miFile.Caption" xml:space="preserve">
+    <value>Файл</value>
+  </data>
+  <data name="pageProgNr.Text" xml:space="preserve">
+    <value>Pr#</value>
+  </data>
+  <data name="lblHotkeyLeft.Text" xml:space="preserve">
+    <value>F3: Фильтр | F4: Список | -: Вверх | +: Вниз | Del: Удалить</value>
+  </data>
+  <data name="colOutHide.Caption" xml:space="preserve">
+    <value>Скрыть</value>
+  </data>
+  <data name="mnuHelp.Caption" xml:space="preserve">
+    <value>Помощь</value>
+  </data>
+  <data name="miWiki.Caption" xml:space="preserve">
+    <value>Вики ChanSort</value>
+  </data>
+  <data name="miOpenWebsite.Caption" xml:space="preserve">
+    <value>Сайт ChanSort...</value>
+  </data>
+  <data name="miAbout.Caption" xml:space="preserve">
+    <value>О ChanSort ...</value>
+  </data>
+  <data name="bar1.Text" xml:space="preserve">
+    <value>Инструменты</value>
+  </data>
+  <data name="miMoveUp.Caption" xml:space="preserve">
+    <value>Переместить вверх</value>
+  </data>
  <data name="colOutServiceType.Caption" xml:space="preserve">
    <value>Тип сервиса</value>
  </data>
--- a/source/ChanSort/ReferenceListForm.cs
+++ b/source/ChanSort/ReferenceListForm.cs
@@ -157,7 +157,7 @@ namespace ChanSort.Ui
      this.comboSource.Properties.Items.Clear();
      foreach (var list in serializer.DataRoot.ChannelLists)
      {
-        if (!list.IsMixedSouceFavoritesList && list.Channels.Count > 0)
+        if (!list.IsMixedSourceFavoritesList && list.Channels.Count > 0)
          this.comboSource.Properties.Items.Add(list);
      }

@@ -165,7 +165,7 @@ namespace ChanSort.Ui
      this.comboTarget.Properties.Items.Clear();
      foreach (var list in main.DataRoot.ChannelLists)
      {
-        if (!list.IsMixedSouceFavoritesList && list.Channels.Count > 0)
+        if (!list.IsMixedSourceFavoritesList && list.Channels.Count > 0)
        {
          this.comboTarget.Properties.Items.Add(list);
          if (main.CurrentChannelList == list)
--- a/source/changelog.md
+++ b/source/changelog.md
@@ -1,7 +1,7 @@
 ChanSort Change Log 
 ===================

-2016-04-18
+2016-04-27
 - added support for Hisense channel.db channel lists

 2015-11-29
--- a/source/makeDistribZip.cmd
+++ b/source/makeDistribZip.cmd
@@ -2,7 +2,7 @@
 cd /d %~dp0
 set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2%
 set target=%cd%\..\..\ChanSort_%curdate%
-set DXversion=15.1
+set DXversion=15.2
 mkdir "%target%" 2>nul
 del /s /q "%target%\*"
 copy debug\ChanSort.exe* "%target%"