diff --git a/source/ChanSort.Api/ChanSort.Api.csproj b/source/ChanSort.Api/ChanSort.Api.csproj index bd5d3bb..9e0b56b 100644 --- a/source/ChanSort.Api/ChanSort.Api.csproj +++ b/source/ChanSort.Api/ChanSort.Api.csproj @@ -110,11 +110,13 @@ Resources.de.Designer.cs Designer + ResXFileCodeGenerator Resources.Designer.cs Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Api/Resources.ru.resx b/source/ChanSort.Api/Resources.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Api/Resources.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj b/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj index cbefd3c..8986014 100644 --- a/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj +++ b/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj @@ -96,11 +96,13 @@ Resources.de.Designer.cs Designer + ResXFileCodeGenerator Resources.Designer.cs Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.ru.resx b/source/ChanSort.Loader.GlobalClone/Resources.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.GlobalClone/Resources.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj index f230c95..abb7cc9 100644 --- a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj +++ b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj @@ -120,28 +120,42 @@ PresetProgramNrDialog.cs + + PresetProgramNrDialog.cs + PresetProgramNrDialog.cs + + PresetProgramNrDialog.cs + ResXFileCodeGenerator Resource.de.Designer.cs Designer + ResXFileCodeGenerator Resource.Designer.cs Designer + TvSettingsForm.cs Designer + + TvSettingsForm.cs + TvSettingsForm.cs Designer + + TvSettingsForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/PresetProgramNrDialog.ru.resx b/source/ChanSort.Loader.LG/PresetProgramNrDialog.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.LG/PresetProgramNrDialog.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/Resource.pt.resx b/source/ChanSort.Loader.LG/Resource.pt.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.LG/Resource.pt.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/Resource.ru.resx b/source/ChanSort.Loader.LG/Resource.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.LG/Resource.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.de.resx b/source/ChanSort.Loader.LG/TvSettingsForm.de.resx index c0a2826..5eddd3c 100644 --- a/source/ChanSort.Loader.LG/TvSettingsForm.de.resx +++ b/source/ChanSort.Loader.LG/TvSettingsForm.de.resx @@ -155,7 +155,7 @@ Senderliste automatisch aktualisieren (empfohlen: AUS) - EINST. Menu + EINST. Menü Das Dateiformat Ihres TV-Modells wird nicht vollständig unterstützt. Deshalb sind viele Einstellungen in diesem Dialog gesperrt. @@ -163,4 +163,16 @@ TV Einstellungen + + Ok + + + Information + + + OPTION Menü + + + Hotelmodus-Menü suchen + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.pt.resx b/source/ChanSort.Loader.LG/TvSettingsForm.pt.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.LG/TvSettingsForm.pt.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.ru.resx b/source/ChanSort.Loader.LG/TvSettingsForm.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort.Loader.LG/TvSettingsForm.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/Resource.Designer.cs b/source/ChanSort.Loader.Samsung/Resource.Designer.cs index 84791b7..c2902e6 100644 --- a/source/ChanSort.Loader.Samsung/Resource.Designer.cs +++ b/source/ChanSort.Loader.Samsung/Resource.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -59,18 +59,5 @@ namespace ChanSort.Loader.Samsung { resourceCulture = value; } } - - /// - /// Looks up a localized string similar to This file contains no data, all bytes in it are set to 0. - /// - ///Please make sure your USB stick is formatted as FAT32 and preferrably not larger than 4GB. - ///If that still does not work, try to reset your TV to factory defaults and run a new channel search. - ///(This might be necessary after a firmware update.). - /// - internal static string ScmSerializer_AllBytesInFileAreZero { - get { - return ResourceManager.GetString("ScmSerializer_AllBytesInFileAreZero", resourceCulture); - } - } } } diff --git a/source/ChanSort.Loader.Samsung/Resource.de.resx b/source/ChanSort.Loader.Samsung/Resource.de.resx index aa07f79..4fdb1b6 100644 --- a/source/ChanSort.Loader.Samsung/Resource.de.resx +++ b/source/ChanSort.Loader.Samsung/Resource.de.resx @@ -98,11 +98,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Diese Datei enthält keine Daten, alle Bytes darin haben den Wert 0. - -Bitte stellen Sie sicher, dass der USB Stick mit FAT32 formatiert ist und wenn möglich nicht größer als 4GB ist. -Sollte es danach weiterhin nicht funktionieren, versuchen Sie bitte das Gerät auf Werkseinstellungen zurückzusetzen und einen Suchlauf durchzuführen. -(Dies kann nach machen Firmwareupdates nötig sein, damit Export/Import wieder funktionieren.) - \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/Resource.resx b/source/ChanSort.Loader.Samsung/Resource.resx index 05141aa..4fdb1b6 100644 --- a/source/ChanSort.Loader.Samsung/Resource.resx +++ b/source/ChanSort.Loader.Samsung/Resource.resx @@ -98,11 +98,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - This file contains no data, all bytes in it are set to 0. - -Please make sure your USB stick is formatted as FAT32 and preferrably not larger than 4GB. -If that still does not work, try to reset your TV to factory defaults and run a new channel search. -(This might be necessary after a firmware update.) - \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/ScmSerializer.cs b/source/ChanSort.Loader.Samsung/ScmSerializer.cs index da86b4b..2e29f78 100644 --- a/source/ChanSort.Loader.Samsung/ScmSerializer.cs +++ b/source/ChanSort.Loader.Samsung/ScmSerializer.cs @@ -4,7 +4,6 @@ using System.IO; using System.Reflection; using System.Linq; using System.Text; -using System.Windows.Forms; using ChanSort.Api; using ICSharpCode.SharpZipLib.Zip; @@ -109,8 +108,6 @@ namespace ChanSort.Loader.Samsung #region Load() public override void Load() { - if (AllBytesInFileAreZero()) - return; using (ZipFile zip = new ZipFile(this.FileName)) { DetectModelConstants(zip); @@ -142,20 +139,6 @@ namespace ChanSort.Loader.Samsung } #endregion - #region AllBytesInFileAreZero() - private bool AllBytesInFileAreZero() - { - byte[] content = File.ReadAllBytes(this.FileName); - foreach (var b in content) - { - if (b != 0) - return false; - } - - throw new FileLoadException(Resource.ScmSerializer_AllBytesInFileAreZero); - } - #endregion - #region DetectModelConstants() private void DetectModelConstants(ZipFile zip) { diff --git a/source/ChanSort/AboutForm.resx b/source/ChanSort/AboutForm.resx index 5080da1..1567c5b 100644 --- a/source/ChanSort/AboutForm.resx +++ b/source/ChanSort/AboutForm.resx @@ -153,7 +153,7 @@ http://github.com/PredatH0r/ChanSort - + @Invariant 108, 90 @@ -198,7 +198,7 @@ horst@beham.biz - + @Invariant 108, 31 @@ -282,7 +282,7 @@ GNU GPLv3 - + @Invariant 108, 66 @@ -396,7 +396,7 @@ Horst Beham - + @Invariant txtAuthor diff --git a/source/ChanSort/AboutForm.ru.resx b/source/ChanSort/AboutForm.ru.resx new file mode 100644 index 0000000..93408e6 --- /dev/null +++ b/source/ChanSort/AboutForm.ru.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + О ChanSort + + + Закрыть + + + Сайт проекта: + + + Автор: + + + Лицензия: + + + Благодарность: + + \ No newline at end of file diff --git a/source/ChanSort/ActionBox.pt.resx b/source/ChanSort/ActionBox.pt.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort/ActionBox.pt.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort/ActionBox.ru.resx b/source/ChanSort/ActionBox.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort/ActionBox.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort/ChanSort.csproj b/source/ChanSort/ChanSort.csproj index 5b67527..5323a6d 100644 --- a/source/ChanSort/ChanSort.csproj +++ b/source/ChanSort/ChanSort.csproj @@ -179,12 +179,21 @@ AboutForm.cs Designer + + AboutForm.cs + ActionBox.cs + + ActionBox.cs + ActionBox.cs + + ActionBox.cs + CharsetForm.cs @@ -195,6 +204,9 @@ CharsetForm.cs Designer + + CharsetForm.cs + GlobalImageCollection.cs @@ -213,6 +225,9 @@ MainForm.cs Designer + + MainForm.cs + ChannelListReport.cs @@ -220,9 +235,15 @@ ReportOptionsDialog.cs Designer + + ReportOptionsDialog.cs + ReportOptionsDialog.cs + + ReportOptionsDialog.cs + ResXFileCodeGenerator Resources.pt.Designer.cs @@ -244,6 +265,7 @@ Resources.de.resx True + WaitForm1.cs @@ -254,6 +276,9 @@ WaitForm1.cs Designer + + WaitForm1.cs + diff --git a/source/ChanSort/CharsetForm.de.resx b/source/ChanSort/CharsetForm.de.resx index 1890d23..d18ae39 100644 --- a/source/ChanSort/CharsetForm.de.resx +++ b/source/ChanSort/CharsetForm.de.resx @@ -129,4 +129,7 @@ Zeichensatz + + Ok + \ No newline at end of file diff --git a/source/ChanSort/CharsetForm.resx b/source/ChanSort/CharsetForm.resx index 042d792..2fdfc6d 100644 --- a/source/ChanSort/CharsetForm.resx +++ b/source/ChanSort/CharsetForm.resx @@ -219,9 +219,6 @@ colName - - - 433, 37 @@ -333,9 +330,6 @@ btnOk - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.1, Version=15.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -364,4 +358,7 @@ 17, 17 + + Description + \ No newline at end of file diff --git a/source/ChanSort/CharsetForm.ru.resx b/source/ChanSort/CharsetForm.ru.resx new file mode 100644 index 0000000..dfff5d6 --- /dev/null +++ b/source/ChanSort/CharsetForm.ru.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Набор символов + + + Отменить + + + Набор символов по умолчанию для моей страны + + + Ok + + \ No newline at end of file diff --git a/source/ChanSort/MainForm.Designer.cs b/source/ChanSort/MainForm.Designer.cs index dc10598..eacbeda 100644 --- a/source/ChanSort/MainForm.Designer.cs +++ b/source/ChanSort/MainForm.Designer.cs @@ -748,10 +748,10 @@ // // colServiceTypeName // + resources.ApplyResources(this.colServiceTypeName, "colServiceTypeName"); this.colServiceTypeName.FieldName = "ServiceTypeName"; this.colServiceTypeName.Name = "colServiceTypeName"; this.colServiceTypeName.OptionsColumn.AllowEdit = false; - resources.ApplyResources(this.colServiceTypeName, "colServiceTypeName"); // // colSatellite // @@ -2006,6 +2006,7 @@ ((System.ComponentModel.ISupportInitialize)(this.popupInputSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.popupFavList)).EndInit(); this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs index fb99dfd..83a7c95 100644 --- a/source/ChanSort/MainForm.cs +++ b/source/ChanSort/MainForm.cs @@ -1885,12 +1885,12 @@ namespace ChanSort.Ui private void miWiki_ItemClick(object sender, ItemClickEventArgs e) { - BrowserHelper.OpenUrl("http://sourceforge.net/p/chansort/wiki/Home/"); + BrowserHelper.OpenUrl("https://github.com/PredatH0r/ChanSort/wiki"); } private void miOpenWebsite_ItemClick(object sender, ItemClickEventArgs e) { - BrowserHelper.OpenUrl("http://sourceforge.net/p/chansort/"); + BrowserHelper.OpenUrl("https://github.com/PredatH0r/ChanSort"); } private void miAbout_ItemClick(object sender, ItemClickEventArgs e) diff --git a/source/ChanSort/MainForm.de.resx b/source/ChanSort/MainForm.de.resx index fed03c0..3d0e5e0 100644 --- a/source/ChanSort/MainForm.de.resx +++ b/source/ChanSort/MainForm.de.resx @@ -464,7 +464,7 @@ Markierte Sender aus sortierter Liste entfernen - Sortierte Sender (.csv) + Sortierte Sender Alte Pr# @@ -562,4 +562,70 @@ Alle Sender + + Filter + + + FIlter + + + Werkzeuge + + + Audio PID + + + Pr. Index + + + Pr. Index + + + Reihenfolge + + + Netzwerk (ONID) + + + Service Typ + + + Anbieter + + + Service ID + + + Service Typ ID + + + Signal- quelle + + + Video PID + + + Alle Zeichensätze... + + + Sender aus Referenzliste hinzufügen... + + + ISO Zeichensätze + + + Zuletzt verwendet + + + Wiki + + + Pr# + + + Transport Stream ID + + + Service Typ + \ No newline at end of file diff --git a/source/ChanSort/MainForm.pt.resx b/source/ChanSort/MainForm.pt.resx index 0916d9f..425aa06 100644 --- a/source/ChanSort/MainForm.pt.resx +++ b/source/ChanSort/MainForm.pt.resx @@ -82,7 +82,7 @@ Blo- queado - + F3: Filtro | F4: Lista | -: para cima | +: para baixo | DEL: remover @@ -269,7 +269,7 @@ Acrescentar e definar posição de canal - Canais ordenados (.csv) + Canais ordenados Valor Pr# anterior @@ -329,7 +329,7 @@ Nome da rede - Tipo serviço + Tipo serviço ID Sserviço ID @@ -367,4 +367,7 @@ Esc- onder + + Tipo serviço + \ No newline at end of file diff --git a/source/ChanSort/MainForm.resx b/source/ChanSort/MainForm.resx index c26d5c9..4b01619 100644 --- a/source/ChanSort/MainForm.resx +++ b/source/ChanSort/MainForm.resx @@ -132,7 +132,7 @@ Fill - 2, 54 + 2, 53 Tahoma, 8.25pt, style=Bold @@ -211,7 +211,7 @@ UID - + @Invariant Lock @@ -258,7 +258,7 @@ Numeric - 449, 418 + 449, 419 1 @@ -373,7 +373,7 @@ Sub List - + @Invariant False @@ -465,38 +465,38 @@ Add to &Favorites - Set &A - + &A + @Invariant - Set &B - + &B + @Invariant - Set &C - + &C + @Invariant - Set &D - + &D + @Invariant - Set &E - + &E + @Invariant Remove from Favorites - Unset &A - + &A + @Invariant - Unset &B - + &B + @Invariant - Unset &C - + &C + @Invariant - Unset &D - + &D + @Invariant - Unset &E - + &E + @Invariant &Lock channel: on @@ -535,16 +535,16 @@ &English - + @Invariant &Deutsch - + @Invariant Português - + @Invariant ру́сский - + @Invariant &Character set @@ -552,11 +552,14 @@ All &character sets... - ISO Zeichensätze + ISO character sets Show warnings after loading file + + Automatically show any warnings after opening a file + &Accessibility @@ -568,7 +571,7 @@ mnuInputSource - + @Invariant Opens a submenu for the program of favorite list selection. This menu can be directly activated with the Shift+F1 key @@ -577,7 +580,7 @@ mnuFavList - + @Invariant Program list @@ -626,8 +629,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNC4yLCBWZXJzaW9uPTE0 - LjIuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4xLCBWZXJzaW9uPTE1 + LjEuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEZpbGUE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICKaPJ5gsBeU2NTSFe @@ -636,8 +639,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNC4yLCBWZXJzaW9uPTE0 - LjIuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4xLCBWZXJzaW9uPTE1 + LjEuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEhlbHAE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICdEVVDegwMU2acNpw @@ -646,8 +649,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNC4yLCBWZXJzaW9uPTE0 - LjIuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4xLCBWZXJzaW9uPTE1 + LjEuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAABEVkaXQE/P///wtTeXN0ZW0uR3VpZAsAAAACX2ECX2IC X2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICZMTu18lZRU+IqmAu @@ -656,8 +659,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNC4yLCBWZXJzaW9uPTE0 - LjIuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4xLCBWZXJzaW9uPTE1 + LjEuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAAB09wdGlvbnME/P///wtTeXN0ZW0uR3VpZAsAAAACX2EC X2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICXJMOh9nzAkKc @@ -666,8 +669,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNC4yLCBWZXJzaW9uPTE0 - LjIuNy4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA + AAEAAAD/////AQAAAAAAAAAMAgAAAF1EZXZFeHByZXNzLlh0cmFCYXJzLnYxNS4xLCBWZXJzaW9uPTE1 + LjEuNi4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAA ACZEZXZFeHByZXNzLlh0cmFCYXJzLkJhck1hbmFnZXJDYXRlZ29yeQMAAAAETmFtZQRHdWlkB1Zpc2li bGUBAwALU3lzdGVtLkd1aWQBAgAAAAYDAAAADUFjY2Vzc2liaWxpdHkE/P///wtTeXN0ZW0uR3VpZAsA AAACX2ECX2ICX2MCX2QCX2UCX2YCX2cCX2gCX2kCX2oCX2sAAAAAAAAAAAAAAAgHBwICAgICAgICeIvz @@ -1001,7 +1004,7 @@ \d{1,4} - + @Invariant RegEx @@ -1035,9 +1038,6 @@ 0 - - groupControl1 - grpTopPanel @@ -1819,7 +1819,7 @@ DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v15.1, Version=15.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - 06/13/2015 13:20:52 + 10/04/2015 16:31:34 16, 16 @@ -1865,7 +1865,7 @@ ±E - + @Invariant btnToggleFavE @@ -1892,7 +1892,7 @@ ±D - + @Invariant btnToggleFavD @@ -1919,7 +1919,7 @@ ±C - + @Invariant btnToggleFavC @@ -1946,7 +1946,7 @@ ±B - + @Invariant btnToggleFavB @@ -1973,7 +1973,7 @@ ±A - + @Invariant btnToggleFavA @@ -2131,7 +2131,7 @@ Top - 2, 21 + 2, 20 449, 33 @@ -2180,12 +2180,12 @@ Panel1 - + @Invariant Fill - 2, 54 + 2, 53 Tahoma, 8.25pt, style=Bold @@ -2386,7 +2386,7 @@ 40 - Service Type + Service Type ID True @@ -2397,6 +2397,9 @@ 45 + + Service Type + True @@ -2432,7 +2435,7 @@ TS ID - + @Invariant Transport Stream ID @@ -2465,7 +2468,7 @@ Uid - + @Invariant 120 @@ -2503,7 +2506,7 @@ Signal source - 1012, 418 + 1012, 419 1 @@ -2580,9 +2583,6 @@ Append all currently unsorted channels at the end of the list - - - 71, 5 @@ -2674,7 +2674,7 @@ Top - 2, 21 + 2, 20 1012, 33 @@ -2723,7 +2723,7 @@ Panel2 - + @Invariant 1474, 491 @@ -2732,7 +2732,7 @@ splitContainerControl1 - + @Invariant splitContainerControl1 diff --git a/source/ChanSort/MainForm.ru.resx b/source/ChanSort/MainForm.ru.resx new file mode 100644 index 0000000..bd7b796 --- /dev/null +++ b/source/ChanSort/MainForm.ru.resx @@ -0,0 +1,471 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Краткое имя + + + 1-999 + + + Удалить из Избранного + + + Добавить выбранные каналы в отсортированный список + + + Сбросить фильтр + + + Заблокировать + + + Изменить нумерацию каналов + + + Установить: + + + Закрыть соединение при перемещении / удалении канала + + + << + + + ChanSort {0} - редактор списка каналов для телевизоров Samsung, LG, Pansonic и Toshiba + + + Новый + + + Источник сигнала + + + Настройка устройства... + + + Оператор сети + + + Новый номер программы + + + В активном состоянии все каналы после текущего будут автоматически перенумерованы + + + Заблокировать канал + + + Сетевое имя + + + Переименовать канал + + + << Добавить все + + + Инструменты + + + Добавить каналы + + + Телевизор + + + Добавить все текущие несортированные каналы в конец списка + + + Название канала + + + Последние файлы + + + Название канала + + + Канал/Транспондер + + + Сохранить как... + + + заменить + + + Сохранить список... + + + Скрыть + + + Аудио PID + + + Файл и информация... + + + Добавить в Избранное + + + Не пропускать канал + + + Заблокированный + + + X + + + Пропускать + + + Язык + + + Настройки + + + ID транспортного потока + + + Order + + + Режим вставки: + + + Спутник + + + Старый + + + Видео PID + + + F5: Фильтр | F6: Список | Enter: Добавить + + + X + + + Тип сервиса + + + Сортировать каналы по алфавиту + + + Добавить каналы из списка... + + + Вики ChanSort + + + Переместить вниз + + + Файл + + + Родительский контроль + + + после + + + Удалить выбранные каналы + + + Фильтр + + + Полярность + + + ID сервиса + + + Переместить выбранные каналы вверх + + + Отсортированные каналы + + + Помощь + + + Фильтр + + + Переместить выбранные каналы вниз + + + Зашифрованный + + + Нет списков каналов + + + О ChanSort ... + + + Пропустить канал + + + Все каналы + + + Сохранить + + + Избранное + + + Открыть файл данных TV... + + + Скрыть + + + ID Тип сервиса + + + Перенастроить канал и удалить дубликаты + + + Изменить нумерацию выбранных каналов + + + Восстановить из резервной копии + + + Родительский контроль + + + Переместить вверх + + + Выход + + + Скрыть канал + + + Зашифрованный + + + до + + + Сеть (ONID) + + + Сбросить фильтр + + + Индекс пр. + + + Номер канала или транспондер + + + F3: Фильтр | F4: Список | -: Вверх | +: Вниз | Del: Удалить + + + Скорость передачи + + + Новый + + + Показывать предупреждения после загрузки файла + + + Перезагрузить + + + Разблокировать канал + + + Правка + + + Pr# + + + Удалить каналы + + + Номер программы для добавления и настройки операций + + + Пропускать + + + Избранное + + + Сайт ChanSort... + + + Экспорт в Excel... + + + Старый номер программы + + + Показать канал + + + Очистка данных канала + + + ^ + + + v + + + Все наборы символов... + + + Загрузить список... + + + Частота (MHz) + + + Новый номер программы + + + Индекс пр. + + + Удалить выбранные каналы из отсортированного списка + + + Набор символов + + + Тип сервиса + + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.de.resx b/source/ChanSort/Printing/ReportOptionsDialog.de.resx index f04b5a3..03c7a43 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.de.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.de.resx @@ -139,4 +139,7 @@ Druckoptionen + + Name + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.pt.resx b/source/ChanSort/Printing/ReportOptionsDialog.pt.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort/Printing/ReportOptionsDialog.pt.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort/Printing/ReportOptionsDialog.resx b/source/ChanSort/Printing/ReportOptionsDialog.resx index 3617317..dd34597 100644 --- a/source/ChanSort/Printing/ReportOptionsDialog.resx +++ b/source/ChanSort/Printing/ReportOptionsDialog.resx @@ -224,7 +224,7 @@ Tahoma - + @Invariant 106, 52 diff --git a/source/ChanSort/Printing/ReportOptionsDialog.ru.resx b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort/Printing/ReportOptionsDialog.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort/Properties/Resources.ru.resx b/source/ChanSort/Properties/Resources.ru.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/source/ChanSort/Properties/Resources.ru.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/source/ChanSort/WaitForm1.resx b/source/ChanSort/WaitForm1.resx index 332547f..5db70de 100644 --- a/source/ChanSort/WaitForm1.resx +++ b/source/ChanSort/WaitForm1.resx @@ -140,7 +140,7 @@ progressPanel1 - + @Invariant 0, 14, 0, 14 @@ -243,7 +243,7 @@ Form1 - + @Invariant Horizontal @@ -253,4 +253,7 @@ True + + Please be patient + \ No newline at end of file diff --git a/source/ChanSort/WaitForm1.ru.resx b/source/ChanSort/WaitForm1.ru.resx new file mode 100644 index 0000000..1861c36 --- /dev/null +++ b/source/ChanSort/WaitForm1.ru.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Создание файла данных ТВ... + + \ No newline at end of file diff --git a/source/DLL/ChanSort.resources.dll b/source/DLL/ChanSort.resources.dll deleted file mode 100644 index 43c0f43..0000000 Binary files a/source/DLL/ChanSort.resources.dll and /dev/null differ diff --git a/source/Translation.xlsx b/source/Translation.xlsx new file mode 100644 index 0000000..8a2fcab Binary files /dev/null and b/source/Translation.xlsx differ diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd index 62f1caa..61762de 100644 --- a/source/makeDistribZip.cmd +++ b/source/makeDistribZip.cmd @@ -15,7 +15,7 @@ mkdir "%target%\pt" 2>nul mkdir "%target%\ru" 2>nul xcopy /siy debug\de "%target%\de" xcopy /siy debug\pt "%target%\pt" -copy DLL\ChanSort.resources.dll "%target%\ru" +xcopy /siy debug\ru "%target%\ru" copy ..\readme.md "%target%\readme.txt" copy changelog.md "%target%\changelog.txt" for %%f in (Utils Data Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f