Skip to content

[pull] develop from OpenPLi:develop #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 4, 2025
Merged

[pull] develop from OpenPLi:develop #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0ecbab
[fallback] remove import remote receiver port, it isn't used anywhere
WanWizard Nov 3, 2025
276db9a
[fallback] improved screen prompts and help text
WanWizard Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions lib/python/Screens/SetupFallbacktuner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def set_avahiselect_seperate(configElement):
self.ip = ConfigIP(default=ipDefault, auto_jump=True)
self.port = ConfigInteger(default=portDefault, limits=(1, 65535))
self.ip_seperate = ConfigIP(default=ipDefault, auto_jump=True)
self.port_seperate = ConfigInteger(default=portDefault, limits=(1, 65535))
self.ip_dvb_t = ConfigIP(default=ipDefault, auto_jump=True)
self.port_dvb_t = ConfigInteger(default=portDefault, limits=(1, 65535))
self.ip_dvb_c = ConfigIP(default=ipDefault, auto_jump=True)
Expand All @@ -69,13 +68,13 @@ def createSetup(self):
config.usage.remote_fallback_import,
_("Import channels and/or EPG from remote receiver URL when receiver is booted")))
if config.usage.remote_fallback_enabled.value:
self.list.append((_("Enable import timer from fallback tuner"),
self.list.append((_("Enable import timer from fallback receiver"),
config.usage.remote_fallback_external_timer,
_("When enabled the timer from the fallback tuner is imported")))
_("When enabled the timer from the fallback receiver is imported")))
if config.usage.remote_fallback_external_timer.value:
self.list.append((_("Select the timer from the fallback tuner by default"),
self.list.append((_("Select the timer from the fallback receiver by default"),
config.usage.remote_fallback_external_timer_default,
_("When enabled the timer from the fallback tuner is the default timer")))
_("When enabled timers are created on the fallback received by default")))
self.list.append((_("Fallback remote receiver"),
self.avahiselect,
_("Destination of fallback remote receiver")))
Expand All @@ -89,7 +88,7 @@ def createSetup(self):
if self.avahiselect.value == "url":
self.list.append((" %s" % _("Fallback remote receiver URL"),
config.usage.remote_fallback,
_("URL of fallback remote receiver")))
_("URL of remote receiver for imports")))
if config.usage.remote_fallback_import.value:
self.list.append((_("Import remote receiver URL"),
self.avahiselect_seperate,
Expand All @@ -98,9 +97,6 @@ def createSetup(self):
self.list.append((" %s" % _("Fallback remote receiver IP"),
self.ip_seperate,
_("IP of fallback remote receiver")))
self.list.append((" %s" % _("Fallback remote receiver Port"),
self.port_seperate,
_("Port of fallback remote receiver")))
if self.avahiselect_seperate.value == "url":
self.list.append((" %s" % _("Fallback remote receiver URL"),
config.usage.remote_fallback_import_url,
Expand All @@ -122,19 +118,19 @@ def createSetup(self):
config.usage.remote_fallback_nok,
_("Show notification when import channels and/or EPG from remote receiver URL did not complete")))
if config.usage.remote_fallback_enabled.value and config.usage.remote_fallback.value:
self.list.append((_("Customize OpenWebIF settings for fallback tuner"),
self.list.append((_("Customize OpenWebIF settings for fallback receiver"),
config.usage.remote_fallback_openwebif_customize,
_("When enabled you can customize the OpenWebIf settings for the fallback tuner")))
_("When enabled you can customize the OpenWebIf settings for the fallback receiver")))
if config.usage.remote_fallback_openwebif_customize.value:
self.list.append((" %s" % _("User ID"),
config.usage.remote_fallback_openwebif_userid,
_("Set the User ID of the OpenWebif from your fallback tuner")))
_("Set the User ID of the OpenWebif from your fallback receiver")))
self.list.append((" %s" % _("Password"),
config.usage.remote_fallback_openwebif_password,
_("Set the password of the OpenWebif from your fallback tuner")))
_("Set the password of the OpenWebif from your fallback receiver")))
self.list.append((" %s" % _("Port"),
config.usage.remote_fallback_openwebif_port,
" %s" % _("Set the port of the OpenWebif from your fallback tuner")))
" %s" % _("Set the port of the OpenWebif from your fallback receiver")))
self.list.append((_("Alternative URLs for DVB-T/C or ATSC"),
config.usage.remote_fallback_alternative,
_("Set alternative fallback tuners for DVB-T/C or ATSC")))
Expand Down Expand Up @@ -189,7 +185,7 @@ def keySave(self):
elif self.avahiselect.value != "url":
config.usage.remote_fallback.value = self.avahiselect.value
if self.avahiselect_seperate.value == "ip":
config.usage.remote_fallback_import_url.value = "http://%d.%d.%d.%d:%d" % (tuple(self.ip_seperate.value) + (self.port_seperate.value,))
config.usage.remote_fallback_import_url.value = "http://%d.%d.%d.%d:%d" % (tuple(self.ip_seperate.value) + (80,))
elif self.avahiselect_seperate.value == "same":
config.usage.remote_fallback_import_url.value = ""
elif self.avahiselect_seperate.value != "url":
Expand Down
12 changes: 6 additions & 6 deletions po/ar.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7272,7 +7272,7 @@ msgid "Please choose an extension..."
msgstr "من فضلك أختار من الملحقات..."

#, fuzzy
msgid "Please configure the fallback tuner setup"
msgid "Please configure the fallback receiver setup"
msgstr "ضبط مؤالف التراجع"

msgid ""
Expand Down Expand Up @@ -9097,7 +9097,7 @@ msgid "Select the time zone within the area or region."
msgstr "تعيين مكان أيقونة التسجيل"

#, fuzzy
msgid "Select the timer from the fallback tuner by default"
msgid "Select the timer from the fallback receiver by default"
msgstr "عند تمكين اندفاع اللاقط سيتم فرضه"

msgid "Select the tuner that controls the motorised dish."
Expand Down Expand Up @@ -11618,7 +11618,7 @@ msgid "URL"
msgstr "الرابط"

#, fuzzy
msgid "URL of fallback remote receiver"
msgid "URL of remote receiver for imports"
msgstr "تمكين الريموت الإحتياطي في الرسيفر"

msgid "USALS automatically moves a motorised dish to the correct satellite based on the coordinates entered by the user. Without USALS each satellite will need to be setup and saved individually."
Expand Down Expand Up @@ -12384,11 +12384,11 @@ msgid "When enabled the set top box is able to wakeup on LAN"
msgstr ""

#, fuzzy
msgid "When enabled the timer from the fallback tuner is imported"
msgid "When enabled the timer from the fallback receiver is imported"
msgstr "عند تمكين اندفاع اللاقط سيتم فرضه"

#, fuzzy
msgid "When enabled the timer from the fallback tuner is the default timer"
msgid "When enabled the timer from the fallback receiver is the default timer"
msgstr "عند تمكين اندفاع اللاقط سيتم فرضه"

msgid "When enabled then when you select a new channel in the channel selection the channel selection will not close. It will only close when you select the current playing service. This is a kind of preview mode"
Expand All @@ -12398,7 +12398,7 @@ msgstr ""
msgid "When enabled you can control the volume with the arrow buttons instead of getting the channel selection list"
msgstr "عند التمكين، سيعرض أرقام القنوات في شاشة اختيار القناة."

msgid "When enabled you can customize the OpenWebIf settings for the fallback tuner"
msgid "When enabled you can customize the OpenWebIf settings for the fallback receiver"
msgstr ""

msgid "When enabled you can specify a timeframe to ignore the shutdown timer when the receiver is in standby mode"
Expand Down
12 changes: 6 additions & 6 deletions po/bg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6723,7 +6723,7 @@ msgstr "Променете времето за край на записа"
msgid "Please choose an extension..."
msgstr "Моля изберете разширение..."

msgid "Please configure the fallback tuner setup"
msgid "Please configure the fallback receiver setup"
msgstr "Моля конфигурирайте настройките на резервния тунер"

msgid ""
Expand Down Expand Up @@ -8405,7 +8405,7 @@ msgstr "Изберете изместения набор от знаци сам
msgid "Select the time zone within the area or region."
msgstr "Изберете часовата зона в района или региона."

msgid "Select the timer from the fallback tuner by default"
msgid "Select the timer from the fallback receiver by default"
msgstr "Изберете таймера от резервния тунер по подразбиране"

msgid "Select the tuner that controls the motorised dish."
Expand Down Expand Up @@ -10728,7 +10728,7 @@ msgstr "ГОРЕ"
msgid "URL"
msgstr "URL"

msgid "URL of fallback remote receiver"
msgid "URL of remote receiver for imports"
msgstr "Въведете URL на резервния приемник"

msgid "USALS automatically moves a motorised dish to the correct satellite based on the coordinates entered by the user. Without USALS each satellite will need to be setup and saved individually."
Expand Down Expand Up @@ -11441,10 +11441,10 @@ msgstr "Ако е активирано, приемника ще се включ
msgid "When enabled the set top box is able to wakeup on LAN"
msgstr "Ако е включено и ако се поддържа от приемника, то той може да се стартира дистанционно по LAN когато е изключен"

msgid "When enabled the timer from the fallback tuner is imported"
msgid "When enabled the timer from the fallback receiver is imported"
msgstr "Ако е включено, таймерът от резервния тунер се импортира"

msgid "When enabled the timer from the fallback tuner is the default timer"
msgid "When enabled the timer from the fallback receiver is the default timer"
msgstr "Ако е включено, таймерът от резервния тунер е по подразбиране"

msgid "When enabled then when you select a new channel in the channel selection the channel selection will not close. It will only close when you select the current playing service. This is a kind of preview mode"
Expand All @@ -11453,7 +11453,7 @@ msgstr "Ако е включено, то при избор на нов кана
msgid "When enabled you can control the volume with the arrow buttons instead of getting the channel selection list"
msgstr "Ако е включено, можете да регулирате усилването на звука с бутони (ляво/дясно) около бутон OK, вместо да се показва списъка с избор на канали"

msgid "When enabled you can customize the OpenWebIf settings for the fallback tuner"
msgid "When enabled you can customize the OpenWebIf settings for the fallback receiver"
msgstr "Ако е включено, можете да персонализирате настройките на OpenWebIf за резервния тунер"

msgid "When enabled you can specify a timeframe to ignore the shutdown timer when the receiver is in standby mode"
Expand Down
12 changes: 6 additions & 6 deletions po/ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7555,7 +7555,7 @@ msgstr "Si us plau, canvia l'hora d'aturar el enregistrament"
msgid "Please choose an extension..."
msgstr "Si us plau, escull una extensió..."

msgid "Please configure the fallback tuner setup"
msgid "Please configure the fallback receiver setup"
msgstr "Si us plau, configura el sintonitzador de reserva"

#
Expand Down Expand Up @@ -9504,7 +9504,7 @@ msgid "Select the time zone within the area or region."
msgstr "Seleccionar el fus horari dins de la zona o regió."

#, fuzzy
msgid "Select the timer from the fallback tuner by default"
msgid "Select the timer from the fallback receiver by default"
msgstr "Quan estigui activat, s'importarà el programador del sintonitzador de reserva"

msgid "Select the tuner that controls the motorised dish."
Expand Down Expand Up @@ -12107,7 +12107,7 @@ msgstr ""
msgid "URL"
msgstr "URL"

msgid "URL of fallback remote receiver"
msgid "URL of remote receiver for imports"
msgstr "URL del receptor remot de reserva"

msgid "USALS automatically moves a motorised dish to the correct satellite based on the coordinates entered by the user. Without USALS each satellite will need to be setup and saved individually."
Expand Down Expand Up @@ -12900,11 +12900,11 @@ msgstr "Quan estigui activat, el receptor es despertarà automàticament des del
msgid "When enabled the set top box is able to wakeup on LAN"
msgstr "Quan estigui activat, el descodificador és capaç de despertar-se mitjançant la xarxa local"

msgid "When enabled the timer from the fallback tuner is imported"
msgid "When enabled the timer from the fallback receiver is imported"
msgstr "Quan estigui activat, s'importarà el programador del sintonitzador de reserva"

#, fuzzy
msgid "When enabled the timer from the fallback tuner is the default timer"
msgid "When enabled the timer from the fallback receiver is the default timer"
msgstr "Quan estigui activat, s'importarà el programador del sintonitzador de reserva"

msgid "When enabled then when you select a new channel in the channel selection the channel selection will not close. It will only close when you select the current playing service. This is a kind of preview mode"
Expand All @@ -12913,7 +12913,7 @@ msgstr "Quan estigui activat, quan seleccionis un canal nou a la selecció de ca
msgid "When enabled you can control the volume with the arrow buttons instead of getting the channel selection list"
msgstr "Quan estigui activat, podràs controlar el volum amb els botons de fletxa en lloc d’obtenir la llista de selecció de canal"

msgid "When enabled you can customize the OpenWebIf settings for the fallback tuner"
msgid "When enabled you can customize the OpenWebIf settings for the fallback receiver"
msgstr "Quan estigui activat, podràs personalitzar la configuració d’OpenWebIf per al sintonitzador de reserva"

msgid "When enabled you can specify a timeframe to ignore the shutdown timer when the receiver is in standby mode"
Expand Down
12 changes: 6 additions & 6 deletions po/cs.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7673,7 +7673,7 @@ msgstr "Změňte dobu ukončení nahrávání"
msgid "Please choose an extension..."
msgstr "Vyberte si z nabídky rozšíření..."

msgid "Please configure the fallback tuner setup"
msgid "Please configure the fallback receiver setup"
msgstr "Nastavit záložní tuner"

#
Expand Down Expand Up @@ -9647,7 +9647,7 @@ msgstr "Výběr dalšího rozložení znaků jen pro následující znak"
msgid "Select the time zone within the area or region."
msgstr "Vyberte časové pásmo v oblasti nebo regionu."

msgid "Select the timer from the fallback tuner by default"
msgid "Select the timer from the fallback receiver by default"
msgstr "Vybrat časovač ze záložního tuneru jako výchozí"

msgid "Select the tuner that controls the motorised dish."
Expand Down Expand Up @@ -12275,7 +12275,7 @@ msgstr "UP"
msgid "URL"
msgstr "URL"

msgid "URL of fallback remote receiver"
msgid "URL of remote receiver for imports"
msgstr "URL pro záložní vzdálený přijímač"

msgid "USALS automatically moves a motorised dish to the correct satellite based on the coordinates entered by the user. Without USALS each satellite will need to be setup and saved individually."
Expand Down Expand Up @@ -13079,10 +13079,10 @@ msgstr "Při zapnutí TV bude satelitní přijímač automaticky probuzen z poho
msgid "When enabled the set top box is able to wakeup on LAN"
msgstr "Jestliže je zapnuto, pak je možné přijímač probouzet v síti LAN pomocí Magic packetu."

msgid "When enabled the timer from the fallback tuner is imported"
msgid "When enabled the timer from the fallback receiver is imported"
msgstr "Do přehledu časovačů jsou importovány časovače ze záložního tuneru"

msgid "When enabled the timer from the fallback tuner is the default timer"
msgid "When enabled the timer from the fallback receiver is the default timer"
msgstr "Pokud je povoleno, časovač ze záložního tuneru je výchozí časovač."

msgid "When enabled then when you select a new channel in the channel selection the channel selection will not close. It will only close when you select the current playing service. This is a kind of preview mode"
Expand All @@ -13091,7 +13091,7 @@ msgstr "Pokud je povoleno a vyberete nový kanál ve výběru kanálů, pak výb
msgid "When enabled you can control the volume with the arrow buttons instead of getting the channel selection list"
msgstr "Pokud je povoleno, pak můžete ovládat pomocí tlačítek se šipkami hlasitost namísto přístupu do seznamu kanálů"

msgid "When enabled you can customize the OpenWebIf settings for the fallback tuner"
msgid "When enabled you can customize the OpenWebIf settings for the fallback receiver"
msgstr "Můžete přizpůsobit nastavení OpenWebIf pro záložní tuner"

#
Expand Down
12 changes: 6 additions & 6 deletions po/da.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7758,7 +7758,7 @@ msgid "Please choose an extension..."
msgstr "Vælg venligst en udvidelse..."

#, fuzzy
msgid "Please configure the fallback tuner setup"
msgid "Please configure the fallback receiver setup"
msgstr "Fallback remote receiver URL"

#
Expand Down Expand Up @@ -9745,7 +9745,7 @@ msgid "Select the time zone within the area or region."
msgstr "Vælg sorteringsmetode:"

#, fuzzy
msgid "Select the timer from the fallback tuner by default"
msgid "Select the timer from the fallback receiver by default"
msgstr "Fallback remote receiver URL"

msgid "Select the tuner that controls the motorised dish."
Expand Down Expand Up @@ -12453,7 +12453,7 @@ msgstr ""
msgid "URL"
msgstr ""

msgid "URL of fallback remote receiver"
msgid "URL of remote receiver for imports"
msgstr "URL af fallback remote receiver"

msgid "USALS automatically moves a motorised dish to the correct satellite based on the coordinates entered by the user. Without USALS each satellite will need to be setup and saved individually."
Expand Down Expand Up @@ -13275,10 +13275,10 @@ msgstr "Ved aktivering vil receiveren automatisk bruge det lydspor som du har va
msgid "When enabled the set top box is able to wakeup on LAN"
msgstr ""

msgid "When enabled the timer from the fallback tuner is imported"
msgid "When enabled the timer from the fallback receiver is imported"
msgstr ""

msgid "When enabled the timer from the fallback tuner is the default timer"
msgid "When enabled the timer from the fallback receiver is the default timer"
msgstr ""

msgid "When enabled then when you select a new channel in the channel selection the channel selection will not close. It will only close when you select the current playing service. This is a kind of preview mode"
Expand All @@ -13287,7 +13287,7 @@ msgstr ""
msgid "When enabled you can control the volume with the arrow buttons instead of getting the channel selection list"
msgstr "Når aktiveret kan du kontrollere volumen med pileknapperne i stedet for at åbne kanallisten"

msgid "When enabled you can customize the OpenWebIf settings for the fallback tuner"
msgid "When enabled you can customize the OpenWebIf settings for the fallback receiver"
msgstr ""

msgid "When enabled you can specify a timeframe to ignore the shutdown timer when the receiver is in standby mode"
Expand Down
Loading