diff --git a/source/ChanSort.Api/Lookup.csv b/source/ChanSort.Api/Lookup.csv index c61d50a..ce2dcd6 100644 --- a/source/ChanSort.Api/Lookup.csv +++ b/source/ChanSort.Api/Lookup.csv @@ -433,52 +433,52 @@ TRANSP;120;12728 DVBC;kHz;Channel DVBC;73000;D73 DVBC;81000;D81 -DVBC;106000;S 01 -DVBC;114000;S 02 -DVBC;123000;S 03 -DVBC;130000;S 04 -DVBC;138000;S 05 -DVBC;146000;S 06 -DVBC;154000;S 07 -DVBC;162000;S 08 -DVBC;170000;S 09 -DVBC;178000;5 -DVBC;186000;6 -DVBC;194000;7 -DVBC;202000;8 -DVBC;210000;9 -DVBC;218000;10 -DVBC;226000;11 -DVBC;234000;SE 11 -DVBC;242000;SE 12 -DVBC;250000;SE 13 -DVBC;258000;SE 14 -DVBC;266000;SE 15 -DVBC;274000;SE 16 -DVBC;282000;SE 17 -DVBC;290000;SE 18 -DVBC;298000;SE 19 -DVBC;306000;S 21 -DVBC;314000;S 22 -DVBC;322000;S 23 -DVBC;330000;S 24 -DVBC;338000;S 25 -DVBC;346000;S 26 -DVBC;354000;S 27 -DVBC;362000;S 28 -DVBC;370000;S 29 -DVBC;378000;S 30 -DVBC;386000;S 31 -DVBC;394000;S 32 -DVBC;402000;S 33 -DVBC;410000;S 34 -DVBC;418000;S 35 -DVBC;426000;S 36 -DVBC;434000;S 37 -DVBC;442000;S 38 -DVBC;450000;S 39 -DVBC;458000;S 40 -DVBC;466000;S 41 +DVBC;106000;S01 +DVBC;114000;S02 +DVBC;122000;S03 +DVBC;130000;S04 +DVBC;138000;S05 +DVBC;146000;S06 +DVBC;154000;S07 +DVBC;162000;S08 +DVBC;170000;S09 +DVBC;178000;6 +DVBC;186000;7 +DVBC;194000;8 +DVBC;202000;9 +DVBC;210000;10 +DVBC;218000;11 +DVBC;226000;12 +DVBC;234000;S11 +DVBC;242000;S12 +DVBC;250000;S13 +DVBC;258000;S14 +DVBC;266000;S15 +DVBC;274000;S16 +DVBC;282000;S17 +DVBC;290000;S18 +DVBC;298000;S19 +DVBC;306000;S21 +DVBC;314000;S22 +DVBC;322000;S23 +DVBC;330000;S24 +DVBC;338000;S25 +DVBC;346000;S26 +DVBC;354000;S27 +DVBC;362000;S28 +DVBC;370000;S29 +DVBC;378000;S30 +DVBC;386000;S31 +DVBC;394000;S32 +DVBC;402000;S33 +DVBC;410000;S34 +DVBC;418000;S35 +DVBC;426000;S36 +DVBC;434000;S37 +DVBC;442000;S38 +DVBC;450000;S39 +DVBC;458000;S40 +DVBC;466000;S41 DVBC;474000;21 DVBC;482000;22 DVBC;490000;23 diff --git a/source/ChanSort.Api/Model/LookupData.cs b/source/ChanSort.Api/Model/LookupData.cs index 9d6a0cc..18bf29f 100644 --- a/source/ChanSort.Api/Model/LookupData.cs +++ b/source/ChanSort.Api/Model/LookupData.cs @@ -211,16 +211,14 @@ namespace ChanSort.Api } #endregion + #region GetDvbcTransponder() public int GetDvbcTransponder(decimal freqInMhz) { return (int)(freqInMhz - 106) / 8; } + #endregion - public decimal GetDvbcFrequency(int channelTransponder) - { - return channelTransponder * 8 + 106; - } - + #region GetDvbcChannelName() public string GetDvbcChannelName(decimal freqInMhz) { // in case the parameter is in Hz or kHz, correct it to MHz to avoid overflow errors. 2 GHz is the largest plausible frequency @@ -238,5 +236,6 @@ namespace ChanSort.Api //?? dvbcChannels.TryGet((int)freqInMhz + 3) ?? ""; } + #endregion } } diff --git a/source/ChanSort.Loader.MediaTek/Serializer.cs b/source/ChanSort.Loader.MediaTek/Serializer.cs index 0d67d67..77bef59 100644 --- a/source/ChanSort.Loader.MediaTek/Serializer.cs +++ b/source/ChanSort.Loader.MediaTek/Serializer.cs @@ -324,7 +324,7 @@ public class Serializer : SerializerBase // sort the channels in the recombined lists foreach (var list in recombinedLists.Values) { - XmlNode serviceListInfoNode = null; + XmlElement serviceListInfoNode = null; foreach (var chan in list.OrderBy(c => c.NewProgramNr).ThenBy(c => c.OldProgramNr).ThenBy(c => c.RecordIndex)) { if (chan is not Channel ch || ch.IsProxy) @@ -335,9 +335,11 @@ public class Serializer : SerializerBase // reorder nodes physically: first remove all, then add them 1-by-1 if (serviceListInfoNode == null) { - serviceListInfoNode = si.ParentNode; + serviceListInfoNode = (XmlElement)si.ParentNode; while (serviceListInfoNode!.HasChildNodes) serviceListInfoNode.RemoveChild(serviceListInfoNode.FirstChild); + + serviceListInfoNode.SetAttribute("lcn_type", "LCNS_ENABLED"); } serviceListInfoNode.AppendChild(si); diff --git a/source/ChanSort.Loader.Philips/Resources.Designer.cs b/source/ChanSort.Loader.Philips/Resources.Designer.cs index e097325..d0fbafe 100644 --- a/source/ChanSort.Loader.Philips/Resources.Designer.cs +++ b/source/ChanSort.Loader.Philips/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ChanSort.Loader.Philips { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -79,7 +79,13 @@ namespace ChanSort.Loader.Philips { } /// - /// Looks up a localized string similar to INFO: After importing the list back in your TV, unplug it and plug it back in after a few seconds.. + /// Looks up a localized string similar to ATTENTION! + ///After importing the channel list back into your TV, + ///when the "Channel list was replaced" message appears, + ///DO NOT PRESS OK. + ///Instead, while the message is still on the screen, + ///unplug the TV from the power outlet and plug it back in + ///after waiting for at least 5 seconds.. /// internal static string InfoRestartAfterImport { get { diff --git a/source/ChanSort.Loader.Philips/Resources.cs.resx b/source/ChanSort.Loader.Philips/Resources.cs.resx index cbd1aae..f0df111 100644 --- a/source/ChanSort.Loader.Philips/Resources.cs.resx +++ b/source/ChanSort.Loader.Philips/Resources.cs.resx @@ -120,4 +120,13 @@ Storno + + POZOR! +Po importu seznamu kanálů zpět do televizoru, +když se zobrazí zpráva „Seznam kanálů byl nahrazen“, +NESTISKNĚTE OK. +Místo toho, dokud je zpráva stále na obrazovce, +odpojte televizor ze zásuvky a znovu jej zapojte +po uplynutí alespoň 5 sekund. + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/Resources.de.resx b/source/ChanSort.Loader.Philips/Resources.de.resx index de6b540..9df98b6 100644 --- a/source/ChanSort.Loader.Philips/Resources.de.resx +++ b/source/ChanSort.Loader.Philips/Resources.de.resx @@ -118,7 +118,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - INFO: Bitte schalten Sie Ihren Fernseher nach dem Import aus, ziehen den Netzstecker und stecken ihn nach einigen Sekunden wieder an. + ACHTUNG! +Nach dem Import der Senderliste in den TV, +wenn die Meldung "Senderliste wurde ersetzt" angezeigt wird, +DRÜCKEN SIE NICHT auf OK. +Stattdessen, währen die Meldung am Schirm steht, ziehen Sie den +Stromstecker aus der Steckdose, und warten Sie mindestens 5 Sek +bevor sie den Fernseher wieder einstecken. Ihr Fernseher zeigt eventuell eine Falschmeldung, dass der Import fehlschlug. Dies kann ignoriert werden. diff --git a/source/ChanSort.Loader.Philips/Resources.es.resx b/source/ChanSort.Loader.Philips/Resources.es.resx index 81ae9bd..d8cd6d5 100644 --- a/source/ChanSort.Loader.Philips/Resources.es.resx +++ b/source/ChanSort.Loader.Philips/Resources.es.resx @@ -120,4 +120,9 @@ Cancelar + + ¡ATENCIÓN! +Después de importar la lista de canales a su televisor, cuando aparezca el mensaje "Lista de canales reemplazada", NO PRESIONE OK. +En su lugar, mientras el mensaje siga en pantalla, desenchufe el televisor de la toma de corriente y vuelva a enchufarlo después de esperar al menos 5 segundos. + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/Resources.hu.resx b/source/ChanSort.Loader.Philips/Resources.hu.resx index b1ffd23..2dd9ca7 100644 --- a/source/ChanSort.Loader.Philips/Resources.hu.resx +++ b/source/ChanSort.Loader.Philips/Resources.hu.resx @@ -124,7 +124,12 @@ Lehet, hogy a TV hibásan mutatja, hogy az importálás sikertelen volt, de ezt figyelmen kívül lehet hagyni. - INFORMÁCIÓ: Miután importálta a listát a TV -be, húzza ki a hálózati csatlakozót, majd néhány másodperc múlva csatlakoztassa újra. + FIGYELEM! +Miután visszaimportálta a csatornalistát a TV-jébe, +amikor megjelenik a „Csatornalista kicserélve” üzenet, +NE NYOMJA MEG AZ OK GOMBOT. +Ehelyett, amíg az üzenet még mindig a képernyőn látható, +húzza ki a TV-t a konnektorból, majd legalább 5 másodperc várakozás után dugja vissza. FIGYELEM: Ellenőrző összeg hibák voltak a betöltött listában! diff --git a/source/ChanSort.Loader.Philips/Resources.it.resx b/source/ChanSort.Loader.Philips/Resources.it.resx new file mode 100644 index 0000000..73a71b7 --- /dev/null +++ b/source/ChanSort.Loader.Philips/Resources.it.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + ATTENZIONE! +Dopo aver reimportato la lista canali sul televisore, +quando viene visualizzato il messaggio "Lista canali sostituita", +NON PREMERE OK. +Mentre il messaggio è ancora visualizzato sullo schermo, +scollegare il televisore dalla presa di corrente e ricollegarlo +dopo aver atteso almeno 5 secondi. + + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/Resources.pl.resx b/source/ChanSort.Loader.Philips/Resources.pl.resx index 5359c2a..521cbd3 100644 --- a/source/ChanSort.Loader.Philips/Resources.pl.resx +++ b/source/ChanSort.Loader.Philips/Resources.pl.resx @@ -124,7 +124,13 @@ Telewizor może niepoprawnie pokazywać, że import się nie powiódł, ale można to zignorować. - INFORMACJE: Po zaimportowaniu listy z powrotem do telewizora odłącz go i podłącz ponownie po kilku sekundach. + UWAGA! +Po zaimportowaniu listy kanałów z powrotem do telewizora, +gdy pojawi się komunikat „Lista kanałów została zastąpiona”, +NIE NACISKAJ OK. +Zamiast tego, gdy komunikat jest nadal wyświetlany na ekranie, +odłącz telewizor od gniazdka elektrycznego i podłącz go ponownie +po odczekaniu co najmniej 5 sekund. OSTRZEŻENIE: W załadowanej liście wystąpiły błędy sum kontrolnych! diff --git a/source/ChanSort.Loader.Philips/Resources.pt.resx b/source/ChanSort.Loader.Philips/Resources.pt.resx new file mode 100644 index 0000000..1e01190 --- /dev/null +++ b/source/ChanSort.Loader.Philips/Resources.pt.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + ATENÇÃO! +Após importar a lista de canais de volta para a sua TV, +quando a mensagem "Lista de canais substituída" aparecer, +NÃO PRESSIONE OK. +Em vez disso, enquanto a mensagem ainda estiver na tela, +desconecte a TV da tomada e conecte-a novamente +após aguardar pelo menos 5 segundos. + + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/Resources.resx b/source/ChanSort.Loader.Philips/Resources.resx index e211d74..34d07c9 100644 --- a/source/ChanSort.Loader.Philips/Resources.resx +++ b/source/ChanSort.Loader.Philips/Resources.resx @@ -121,7 +121,13 @@ The TV may incorrectly show that the import failed, but that can be ignored. - INFO: After importing the list back in your TV, unplug it and plug it back in after a few seconds. + ATTENTION! +After importing the channel list back into your TV, +when the "Channel list was replaced" message appears, +DO NOT PRESS OK. +Instead, while the message is still on the screen, +unplug the TV from the power outlet and plug it back in +after waiting for at least 5 seconds. WARNING: There were checksum errors in the loaded list! diff --git a/source/ChanSort.Loader.Philips/Resources.ro.resx b/source/ChanSort.Loader.Philips/Resources.ro.resx index 6608474..84d9444 100644 --- a/source/ChanSort.Loader.Philips/Resources.ro.resx +++ b/source/ChanSort.Loader.Philips/Resources.ro.resx @@ -120,4 +120,7 @@ Anulare + + După importarea listei de canale în televizor, când apare mesajul "Import reușit" pe ecran, NU apăsați "OK." În schimb, cât timp mesajul este vizibil, deconectați televizorul de la priza de perete, așteptați cel puțin 5 secunde, apoi conectați-l din nou. Acest pas asigură că lista de canale importată rămâne intactă și fără interferențe. + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/Resources.ru.resx b/source/ChanSort.Loader.Philips/Resources.ru.resx index 3e0bfea..1d8dc7e 100644 --- a/source/ChanSort.Loader.Philips/Resources.ru.resx +++ b/source/ChanSort.Loader.Philips/Resources.ru.resx @@ -121,7 +121,13 @@ Телевизор может неправильно сообщать об ошибке импорта, но это можно игнорировать. - ИНФОРМАЦИЯ: После импорта списка обратно в телевизор отключите его и снова включите через несколько секунд. + ВНИМАНИЕ! +После импорта списка каналов обратно на телевизор, +когда появится сообщение «Список каналов был заменен», +НЕ НАЖИМАЙТЕ OK. +Вместо этого, пока сообщение все еще отображается на экране, +отключите телевизор от розетки и включите его снова, +подождав не менее 5 секунд. ВНИМАНИЕ: В загруженном списке обнаружены ошибки контрольных сумм! diff --git a/source/ChanSort.Loader.Philips/Resources.tr.resx b/source/ChanSort.Loader.Philips/Resources.tr.resx index f2f4486..e94f4cf 100644 --- a/source/ChanSort.Loader.Philips/Resources.tr.resx +++ b/source/ChanSort.Loader.Philips/Resources.tr.resx @@ -120,4 +120,12 @@ Vazgeç + + DİKKAT! +Kanal listesini tekrar televizyonunuza aktardıktan sonra, +"Kanal listesi değiştirildi" mesajı göründüğünde, +OK'A BASMAYIN. +Bunun yerine, mesaj hala ekrandayken, +TV'nin fişini prizden çekin ve en az 5 saniye bekledikten sonra tekrar takın. + \ No newline at end of file diff --git a/source/ChanSort.Loader.Philips/XmlSerializer.cs b/source/ChanSort.Loader.Philips/XmlSerializer.cs index 96a34a0..db20a7c 100644 --- a/source/ChanSort.Loader.Philips/XmlSerializer.cs +++ b/source/ChanSort.Loader.Philips/XmlSerializer.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Net; using System.Reflection; using System.Text; using System.Xml; @@ -477,7 +476,7 @@ namespace ChanSort.Loader.Philips if ((chan.SignalSource & SignalSource.MaskBcast) == SignalSource.DvbT) chan.ChannelOrTransponder = LookupData.Instance.GetDvbtTransponder(chan.FreqInMhz).ToString(); else if ((chan.SignalSource & SignalSource.MaskBcast) == SignalSource.DvbC) - chan.ChannelOrTransponder = LookupData.Instance.GetDvbcChannelName(chan.FreqInMhz); + chan.ChannelOrTransponder = LookupData.Instance.GetDvbcTransponder(chan.FreqInMhz).ToString(); DataRoot.AddChannel(curList, chan); } diff --git a/source/Translation.xlsx b/source/Translation.xlsx index 6db6565..9c9de67 100644 Binary files a/source/Translation.xlsx and b/source/Translation.xlsx differ