From f42413890c955f135c4b98cac9fa86604b81b13e Mon Sep 17 00:00:00 2001
From: Orlandoxx <95180049+Orlandoxx@users.noreply.github.com>
Date: Sat, 9 Dec 2023 21:44:10 +0200
Subject: [PATCH 01/11] Updated Finnish (fi.po) translation.

Translated latest 'menu.xml' and ViX 'plugin.py' changes.
---
 po/fi.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 4a260ba696..c0eb0eb7cc 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: enigma2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-27 23:35+0000\n"
-"PO-Revision-Date: 2023-12-06 06:36+0200\n"
+"PO-Revision-Date: 2023-12-09 21:41+0200\n"
 "Last-Translator: Orlandox\n"
 "Language-Team: timoj/Kojo/Samzam/Orlandox\n"
 "Language: fi\n"
@@ -12870,7 +12870,7 @@ msgstr "Softcam-asetukset"
 msgid "SoftcamCheck"
 msgstr "SoftCam:in tarkistus"
 
-msgid "SoftcamManager"
+msgid "Softcam Management"
 msgstr "Softcam hallinta"
 
 msgid "SoftcamScript enable/disable cam restart"
@@ -13540,7 +13540,7 @@ msgstr ""
 "Suomenkielinen käännös: timoj, Kojo, Samzam, Orlandox\n"
 "\n"
 "Ylläpito : Orlandox\n"
-"06.12.2023\n"
+"09.12.2023\n"
 "http://www.huoltovalikko.com"
 
 msgid "TS file is too large for ISO9660 level 1!"
@@ -18853,7 +18853,7 @@ msgstr "Koko: %sTt"
 msgid "Size: unavailable"
 msgstr "Koko: ei saatavilla"
 
-msgid "Softcam manager"
+msgid "Softcam Manager"
 msgstr "Softcam:n hallinnointi"
 
 msgid "Softcam manager settings"

From 256310d2ef3a8322d41e731bd2fe9360cbb0866f Mon Sep 17 00:00:00 2001
From: openvix-build <openvix-build@moralet.com>
Date: Sat, 9 Dec 2023 22:20:37 +0000
Subject: [PATCH 02/11] openvix: developer 6.4.010.018

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 078a5a1170..1f50fac49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1216,3 +1216,4 @@ openvix: developer 6.4.010.014
 openvix: developer 6.4.010.015
 openvix: developer 6.4.010.016
 openvix: developer 6.4.010.017
+openvix: developer 6.4.010.018

From 8bd9d72ed0598317ea880ba5bef8bfb4c8537b1a Mon Sep 17 00:00:00 2001
From: openvix-build <openvix-build@moralet.com>
Date: Sat, 9 Dec 2023 23:55:41 +0000
Subject: [PATCH 03/11] openvix: developer 6.4.010.019

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 1f50fac49b..01fba4bdb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1217,3 +1217,4 @@ openvix: developer 6.4.010.015
 openvix: developer 6.4.010.016
 openvix: developer 6.4.010.017
 openvix: developer 6.4.010.018
+openvix: developer 6.4.010.019

From a0c632a571bf73b0bd7b9ead70972c692dfdc569 Mon Sep 17 00:00:00 2001
From: Orlandoxx <95180049+Orlandoxx@users.noreply.github.com>
Date: Sun, 10 Dec 2023 10:26:40 +0200
Subject: [PATCH 04/11] Updated fi.po

Added "Softcam manager" translation.
---
 po/fi.po | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index c0eb0eb7cc..1d0449ea6b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: enigma2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-27 23:35+0000\n"
-"PO-Revision-Date: 2023-12-09 21:41+0200\n"
+"PO-Revision-Date: 2023-12-10 10:20+0200\n"
 "Last-Translator: Orlandox\n"
 "Language-Team: timoj/Kojo/Samzam/Orlandox\n"
 "Language: fi\n"
@@ -13540,7 +13540,7 @@ msgstr ""
 "Suomenkielinen käännös: timoj, Kojo, Samzam, Orlandox\n"
 "\n"
 "Ylläpito : Orlandox\n"
-"09.12.2023\n"
+"10.12.2023\n"
 "http://www.huoltovalikko.com"
 
 msgid "TS file is too large for ISO9660 level 1!"
@@ -18856,6 +18856,9 @@ msgstr "Koko: ei saatavilla"
 msgid "Softcam Manager"
 msgstr "Softcam:n hallinnointi"
 
+msgid "Softcam manager"
+msgstr "Softcam:n hallinnointi"
+
 msgid "Softcam manager settings"
 msgstr "Softcam hallinnoinnin asetukset"
 

From 8032d5c5592b7a25a0c2e28fe05a8996b59bf8a7 Mon Sep 17 00:00:00 2001
From: Dimitar Tsenev <dimitar_tsenev@outlook.com>
Date: Tue, 12 Dec 2023 08:44:29 +0200
Subject: [PATCH 05/11] [Fixed] Correct handling of selected index and list
 total count when there is hidden items.

---
 lib/service/listboxservice.cpp | 1 +
 lib/service/listboxservice.h   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/service/listboxservice.cpp b/lib/service/listboxservice.cpp
index 942b767de2..4786901156 100644
--- a/lib/service/listboxservice.cpp
+++ b/lib/service/listboxservice.cpp
@@ -118,6 +118,7 @@ void eListboxServiceContent::removeCurrent()
 void eListboxServiceContent::FillFinished()
 {
 	m_size = m_list.size();
+	m_size_visible = cursorResolve(m_size - 1) + 1;
 	cursorHome();
 
 	if (m_listbox)
diff --git a/lib/service/listboxservice.h b/lib/service/listboxservice.h
index 35f5265908..a4fba48ce3 100644
--- a/lib/service/listboxservice.h
+++ b/lib/service/listboxservice.h
@@ -28,9 +28,9 @@ class eListboxServiceContent: public virtual iListboxContent
 	int getNextBeginningWithChar(char c);
 	int getPrevMarkerPos();
 	int getNextMarkerPos();
-	int getCurrentSelectionIndex() { return m_cursor_number; }
+	int getCurrentSelectionIndex() { return cursorResolve(m_cursor_number); }
 	eSize getItemSize() { return m_itemsize; }
-	int getListSize() { return m_size; }
+	int getListSize() { return m_size_visible; }
 
 		/* support for marked services */
 	void initMarked();
@@ -182,7 +182,7 @@ class eListboxServiceContent: public virtual iListboxContent
 	list::iterator m_cursor, m_saved_cursor;
 
 	int m_cursor_number, m_saved_cursor_number;
-	int m_size;
+	int m_size, m_size_visible;
 
 	eSize m_itemsize;
 	ePtr<iServiceHandler> m_service_center;

From b56bb3189deebbef6abdbe2b7121ed316285918c Mon Sep 17 00:00:00 2001
From: Huevos <rowland@moralet.com>
Date: Thu, 14 Dec 2023 11:13:51 +0100
Subject: [PATCH 06/11] [menu/setup] move playback settings to own screen

---
 data/menu.xml  |  3 ++-
 data/setup.xml | 27 +++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/data/menu.xml b/data/menu.xml
index f75119f78a..4183ed88ea 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -162,7 +162,8 @@ self.session.open(SABnzbdSetupScreen)
 
 		<!-- Menu / Setup / Recordings, Playback & Timeshift -->
 		<menu key="rec" level="1" text="Recordings, Playback &amp; Timeshift" weight="11">
-			<item key="recording_setup" level="0" text="Recording &amp; Playback" weight="10"><screen module="Recordings" screen="RecordingSettings" /></item>
+			<item key="recording_setup" level="0" text="Recording" weight="10"><screen module="Recordings" screen="RecordingSettings" /></item>
+			<item key="playback_setup" level="0" text="Playback" weight="12"><setup id="playback" /></item>
 			<item key="timshift_setup" level="0" text="Timeshift" weight="15"><screen module="Timeshift" screen="TimeshiftSettings" /></item>
 		</menu>
 
diff --git a/data/setup.xml b/data/setup.xml
index b32813e5b9..3ef3fef737 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -199,7 +199,7 @@
 		<item level="1" text="EPG language selection 1" description="Configure the primary EPG language.">config.autolanguage.audio_epglanguage</item>
 		<item level="1" text="EPG language selection 2" conditional="config.autolanguage.audio_epglanguage.value" description="Configure the secondary EPG language.">config.autolanguage.audio_epglanguage_alternative</item>
 	</setup>
-	<setup key="recording" title="Recording and playback">
+	<setup key="recording" title="Recording">
 		<item level="0" text="Default movie location" description="Set the default location for your recordings. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.default_path</item>
 		<item level="2" text="Timer recording location" description="Set the default location for your timers. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.timer_path</item>
 		<item level="2" text="Instant recording location" description="Set the default location for your instant recordings. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.instantrec_path</item>
@@ -210,15 +210,24 @@
 		<item level="0" text="Margin after recording (minutes)" description="When nonzero, a recording will stop later than the ending time indicated by the EPG.">config.recording.margin_after</item>
 		<item level="0" text="Split event detection (minutes)" description="Detect programs split by news bulletins. Choose the maximum duration in minutes to consider as a bulletin, or 0 to disable.">config.recording.split_programme_minutes</item>
 		<item level="2" text="Show message when recording starts" description="When enabled, a popup message will be shown when a recording starts.">config.usage.show_message_when_recording_starts</item>
-		<item level="2" text="Quit Movie Player with EXIT button" description="When enabled, it is possible to leave the Movie Player with exit.">config.usage.leave_movieplayer_onExit</item>
+		<item level="2" text="Limit character set for recording filenames" description="Limit the characters that can be used in recording filenames to (7 bit) ascii. This ensures compatibility with operating systems or file systems with limited character sets.">config.recording.ascii_filenames</item>
+		<item level="2" text="Composition of the recording filenames" description="Configure how recording filenames are constructed.">config.recording.filename_composition</item>
+		<item level="1" text="Show picons in timer list" description="Configure if picons will be shown in the timer list.">config.usage.timerlist_showpicons</item>
+		<item level="1" text="Position of finished timers in timer list" description="Control how finished timers are shown in the timer list. If set to hide, disabled timers will still be shown">config.usage.timerlist_finished_timer_position</item>
+		<item level="2" text="Remove finished timers after (days)" description="Configure the number of days old timers are kept before they are automatically removed from the timer list.">config.recording.keep_timers</item>
+		<item level="2" text="Remove finished timer logs after (days)" description="Configure the number of days old timers' log details are kept before they're automatically removed.">config.recording.keep_finished_timer_logs</item>
+		<item level="2" text="Default recording type" description="Descramble &amp; record ECM' gives the option to descramble afterwards if descrambling on recording failed. 'Don't descramble, record ECM' save a scramble recording that can be descrambled on playback. 'Normal' means descramble the recording and don't record ECM.">config.recording.ecm_data</item>
+		<item level="2" text="Record icon match" description="Select display of record icon based on 'Sref only' or 'Sref + Stream url' where applicable.">config.recording.record_icon_match</item>
+	</setup>
+	<setup key="playback" title="Playback">
 		<item level="2" text="Behavior when a movie is started" description="Configure the behavior when movie playback is started.">config.usage.on_movie_start</item>
 		<item level="2" text="Behavior when a movie is stopped" description="Configure the behavior when movie playback is manually stopped.">config.usage.on_movie_stop</item>
 		<item level="2" text="Behavior when a movie reaches the end" description="Configure the behavior when reaching the end of a movie, during movie playback.">config.usage.on_movie_eof</item>
-		<item level="2" text="Display message before playing next movie" description="When enabled, a popup message will be shown when a movie has finished and the next one will start.">config.usage.next_movie_msg</item>
-		<item level="2" text="Behavior of 'pause' when paused" description="Configure the behavior of the 'pause' key when movie playback is already paused.">config.seek.on_pause</item>
 		<item level="2" text="Custom skip time for '1'/'3' buttons" description="Configure the skip time interval for the 1 and 3 buttons.">config.seek.selfdefined_13</item>
 		<item level="2" text="Custom skip time for '4'/'6' buttons" description="Configure the skip time interval for the 4 and 6 buttons.">config.seek.selfdefined_46</item>
 		<item level="2" text="Custom skip time for '7'/'9' buttons" description="Configure the skip time interval for the 7 and 9 buttons.">config.seek.selfdefined_79</item>
+		<item level="2" text="Quit Movie Player with EXIT button" description="When enabled, it is possible to leave the Movie Player with exit.">config.usage.leave_movieplayer_onExit</item>
+		<item level="2" text="Behavior of 'pause' when paused" description="Configure the behavior of the 'pause' key when movie playback is already paused.">config.seek.on_pause</item>
 		<item level="2" text="Seekbar activation" description="Select seekbar to be activated by arrow L/R (long) or &lt;&lt; &gt;&gt; (long).">config.seek.baractivation</item>
 		<item level="2" text="Seekbar sensibility" description="Set the jump-size of the seekbar.">config.seek.sensibility</item>
 		<item level="2" text="Fast forward speeds" description="Configure the possible fast forward speeds.">config.seek.speeds_forward</item>
@@ -226,15 +235,9 @@
 		<item level="2" text="Slow motion speeds" description="Configure the slow motion speeds.">config.seek.speeds_slowmotion</item>
 		<item level="2" text="Initial fast forward speed" description="Configure the initial fast forward speed. When you press the fast forward button, winding will start at this speed.">config.seek.enter_forward</item>
 		<item level="2" text="Initial rewind speed" description="Configure the initial rewind speed. When you press the rewind button, rewinding will start at this speed.">config.seek.enter_backward</item>
-		<item level="2" text="Limit character set for recording filenames" description="Limit the characters that can be used in recording filenames to (7 bit) ascii. This ensures compatibility with operating systems or file systems with limited character sets.">config.recording.ascii_filenames</item>
-		<item level="2" text="Composition of the recording filenames" description="Configure how recording filenames are constructed.">config.recording.filename_composition</item>
-		<item level="1" text="Show picons in timer list" description="Configure if picons will be shown in the timer list.">config.usage.timerlist_showpicons</item>
-		<item level="1" text="Position of finished timers in timer list" description="Control how finished timers are shown in the timer list. If set to hide, disabled timers will still be shown">config.usage.timerlist_finished_timer_position</item>
-		<item level="2" text="Remove finished timers after (days)" description="Configure the number of days old timers are kept before they are automatically removed from the timer list.">config.recording.keep_timers</item>
-		<item level="2" text="Remove finished timer logs after (days)" description="Configure the number of days old timers' log details are kept before they're automatically removed.">config.recording.keep_finished_timer_logs</item>
+		<item level="2" text="Display message before playing next movie" description="When enabled, a popup message will be shown when a movie has finished and the next one will start.">config.usage.next_movie_msg</item>
 		<item level="2" text="Offline decode delay (ms)" description="Configure the offline decoding delay (in milliseconds). The configured delay is observed at each control word parity change.">config.recording.offline_decode_delay</item>
-		<item level="2" text="Default recording type" description="Descramble &amp; record ECM' gives the option to descramble afterwards if descrambling on recording failed. 'Don't descramble, record ECM' save a scramble recording that can be descrambled on playback. 'Normal' means descramble the recording and don't record ECM.">config.recording.ecm_data</item>
-		<item level="2" text="Record icon match" description="Select display of record icon based on 'Sref only' or 'Sref + Stream url' where applicable.">config.recording.record_icon_match</item>
+
 	</setup>
 	<setup key="harddisk" title="HDD settings">
 		<item level="0" text="Hard disk standby after" description="Configure duration of inactivity before the hard disk drive goes to standby">config.usage.hdd_standby</item>

From f985d3407b9ccccc6f8297818721fe092661b90b Mon Sep 17 00:00:00 2001
From: Huevos <rowland@moralet.com>
Date: Thu, 14 Dec 2023 12:45:43 +0100
Subject: [PATCH 07/11] [Recordings] instanciate "self.errorItem" before
 calling Setup.__init__()

---
 lib/python/Screens/Recordings.py | 2 +-
 lib/python/Screens/Timeshift.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/python/Screens/Recordings.py b/lib/python/Screens/Recordings.py
index c36e2cee52..7dc637a65e 100644
--- a/lib/python/Screens/Recordings.py
+++ b/lib/python/Screens/Recordings.py
@@ -16,9 +16,9 @@ def __init__(self, session):
 		self.buildChoices("DefaultPath", config.usage.default_path, None)
 		self.buildChoices("TimerPath", config.usage.timer_path, None)
 		self.buildChoices("InstantPath", config.usage.instantrec_path, None)
+		self.errorItem = -1
 		Setup.__init__(self, session=session, setup="recording")
 		self.greenText = self["key_green"].text
-		self.errorItem = -1
 		if self.getCurrentItem() in (config.usage.default_path, config.usage.timer_path, config.usage.instantrec_path):
 			self.pathStatus(self.getCurrentValue())
 
diff --git a/lib/python/Screens/Timeshift.py b/lib/python/Screens/Timeshift.py
index 195beb527d..febf5a54bc 100644
--- a/lib/python/Screens/Timeshift.py
+++ b/lib/python/Screens/Timeshift.py
@@ -13,9 +13,9 @@
 class TimeshiftSettings(Setup):
 	def __init__(self, session):
 		self.buildChoices("TimeshiftPath", config.usage.timeshift_path, None)
+		self.errorItem = -1
 		Setup.__init__(self, session=session, setup="timeshift")
 		self.greenText = self["key_green"].text
-		self.errorItem = -1
 		if self.getCurrentItem() is config.usage.timeshift_path:
 			self.pathStatus(self.getCurrentValue())
 

From fa40062d86cfb47f5a1e2e3b214645fed485d1d4 Mon Sep 17 00:00:00 2001
From: Huevos <rowland@moralet.com>
Date: Thu, 14 Dec 2023 12:46:39 +0100
Subject: [PATCH 08/11] [Recordings] remove MessageBoxes

---
 lib/python/Screens/Recordings.py | 7 -------
 lib/python/Screens/Timeshift.py  | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/lib/python/Screens/Recordings.py b/lib/python/Screens/Recordings.py
index 7dc637a65e..1878c0fbe5 100644
--- a/lib/python/Screens/Recordings.py
+++ b/lib/python/Screens/Recordings.py
@@ -3,7 +3,6 @@
 from Components.config import config
 from Components.UsageConfig import preferredPath
 from Screens.LocationBox import MovieLocationBox
-from Screens.MessageBox import MessageBox
 from Screens.Setup import Setup
 from Tools.Directories import fileExists
 import Components.Harddisk
@@ -97,7 +96,6 @@ def selectionChanged(self):
 			Setup.selectionChanged(self)
 		else:
 			self["config"].setCurrentIndex(self.errorItem)
-			self.errorMsg()
 
 	def changedEntry(self):
 		if self.getCurrentItem() in (config.usage.default_path, config.usage.timer_path, config.usage.instantrec_path):
@@ -112,11 +110,6 @@ def keySelect(self):
 		else:
 			Setup.keySelect(self)
 
-	def errorMsg(self):
-		self.session.open(MessageBox, "%s\n\n%s" % (self.footnote, _("Please select a valid directory.")), type=MessageBox.TYPE_ERROR)
-
 	def keySave(self):
 		if self.errorItem == -1:
 			Setup.keySave(self)
-		else:
-			self.errorMsg()
diff --git a/lib/python/Screens/Timeshift.py b/lib/python/Screens/Timeshift.py
index febf5a54bc..355f648234 100644
--- a/lib/python/Screens/Timeshift.py
+++ b/lib/python/Screens/Timeshift.py
@@ -108,7 +108,6 @@ def selectionChanged(self):
 			Setup.selectionChanged(self)
 		else:
 			self["config"].setCurrentIndex(self.errorItem)
-			self.errorMsg()
 
 	def changedEntry(self):
 		if self.getCurrentItem() is config.usage.timeshift_path:
@@ -121,11 +120,6 @@ def keySelect(self):
 		else:
 			Setup.keySelect(self)
 
-	def errorMsg(self):
-		self.session.open(MessageBox, "%s\n\n%s" % (self.footnote, _("Please select a valid directory.")), type=MessageBox.TYPE_ERROR)
-
 	def keySave(self):
 		if self.errorItem == -1:
 			Setup.keySave(self)
-		else:
-			self.errorMsg()

From 19d072af94dedb775841dd2260e28c5d7b7159cb Mon Sep 17 00:00:00 2001
From: Huevos <rowland@moralet.com>
Date: Thu, 14 Dec 2023 12:57:49 +0100
Subject: [PATCH 09/11] [Setup/Recording] only show additional options if
 location is valid

---
 data/setup.xml | 48 ++++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/data/setup.xml b/data/setup.xml
index 3ef3fef737..b7415a03e6 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -201,23 +201,25 @@
 	</setup>
 	<setup key="recording" title="Recording">
 		<item level="0" text="Default movie location" description="Set the default location for your recordings. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.default_path</item>
-		<item level="2" text="Timer recording location" description="Set the default location for your timers. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.timer_path</item>
-		<item level="2" text="Instant recording location" description="Set the default location for your instant recordings. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.instantrec_path</item>
-		<item level="2" text="Recordings - convert IPTV servicetypes to  1" description="Recording 4097, 5001 and 5002 streams not possible with external players, so convert recordings to servicetype 1.">config.recording.setstreamto1</item>
+		<item level="2" text="Timer recording location" conditional="self.errorItem in (-1, 1, 2)" description="Set the default location for your timers. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.timer_path</item>
+		<item level="2" text="Instant recording location" conditional="self.errorItem in (-1, 2)" description="Set the default location for your instant recordings. Press OK to add new locations, LEFT/RIGHT to select from any existing locations.">config.usage.instantrec_path</item>
+		<if conditional="self.errorItem == -1">
+			<item level="2" text="Recordings - convert IPTV servicetypes to  1" description="Recording 4097, 5001 and 5002 streams not possible with external players, so convert recordings to servicetype 1.">config.recording.setstreamto1</item>
 <!--		<item level="2" text="Preferred tuner for recordings" description="Configure which tuner will be preferred for recordings, when more than one tuner is available. 'Disabled' would select a tuner based on preferred tuner in customise screen. 'Auto' would choose based on E2's default rules, ignoring preferred tuner in customise screen.">config.usage.recording_frontend_priority</item>-->
-		<item level="1" text="Recordings always have priority" description="When enabled, a recording is allowed to interrupt live TV, when there are no free tuners.">config.recording.asktozap</item>
-		<item level="0" text="Margin before recording (minutes)" description="When nonzero, a recording will start earlier than the starting time indicated by the EPG.">config.recording.margin_before</item>
-		<item level="0" text="Margin after recording (minutes)" description="When nonzero, a recording will stop later than the ending time indicated by the EPG.">config.recording.margin_after</item>
-		<item level="0" text="Split event detection (minutes)" description="Detect programs split by news bulletins. Choose the maximum duration in minutes to consider as a bulletin, or 0 to disable.">config.recording.split_programme_minutes</item>
-		<item level="2" text="Show message when recording starts" description="When enabled, a popup message will be shown when a recording starts.">config.usage.show_message_when_recording_starts</item>
-		<item level="2" text="Limit character set for recording filenames" description="Limit the characters that can be used in recording filenames to (7 bit) ascii. This ensures compatibility with operating systems or file systems with limited character sets.">config.recording.ascii_filenames</item>
-		<item level="2" text="Composition of the recording filenames" description="Configure how recording filenames are constructed.">config.recording.filename_composition</item>
-		<item level="1" text="Show picons in timer list" description="Configure if picons will be shown in the timer list.">config.usage.timerlist_showpicons</item>
-		<item level="1" text="Position of finished timers in timer list" description="Control how finished timers are shown in the timer list. If set to hide, disabled timers will still be shown">config.usage.timerlist_finished_timer_position</item>
-		<item level="2" text="Remove finished timers after (days)" description="Configure the number of days old timers are kept before they are automatically removed from the timer list.">config.recording.keep_timers</item>
-		<item level="2" text="Remove finished timer logs after (days)" description="Configure the number of days old timers' log details are kept before they're automatically removed.">config.recording.keep_finished_timer_logs</item>
-		<item level="2" text="Default recording type" description="Descramble &amp; record ECM' gives the option to descramble afterwards if descrambling on recording failed. 'Don't descramble, record ECM' save a scramble recording that can be descrambled on playback. 'Normal' means descramble the recording and don't record ECM.">config.recording.ecm_data</item>
-		<item level="2" text="Record icon match" description="Select display of record icon based on 'Sref only' or 'Sref + Stream url' where applicable.">config.recording.record_icon_match</item>
+			<item level="1" text="Recordings always have priority" description="When enabled, a recording is allowed to interrupt live TV, when there are no free tuners.">config.recording.asktozap</item>
+			<item level="0" text="Margin before recording (minutes)" description="When nonzero, a recording will start earlier than the starting time indicated by the EPG.">config.recording.margin_before</item>
+			<item level="0" text="Margin after recording (minutes)" description="When nonzero, a recording will stop later than the ending time indicated by the EPG.">config.recording.margin_after</item>
+			<item level="0" text="Split event detection (minutes)" description="Detect programs split by news bulletins. Choose the maximum duration in minutes to consider as a bulletin, or 0 to disable.">config.recording.split_programme_minutes</item>
+			<item level="2" text="Show message when recording starts" description="When enabled, a popup message will be shown when a recording starts.">config.usage.show_message_when_recording_starts</item>
+			<item level="2" text="Limit character set for recording filenames" description="Limit the characters that can be used in recording filenames to (7 bit) ascii. This ensures compatibility with operating systems or file systems with limited character sets.">config.recording.ascii_filenames</item>
+			<item level="2" text="Composition of the recording filenames" description="Configure how recording filenames are constructed.">config.recording.filename_composition</item>
+			<item level="1" text="Show picons in timer list" description="Configure if picons will be shown in the timer list.">config.usage.timerlist_showpicons</item>
+			<item level="1" text="Position of finished timers in timer list" description="Control how finished timers are shown in the timer list. If set to hide, disabled timers will still be shown">config.usage.timerlist_finished_timer_position</item>
+			<item level="2" text="Remove finished timers after (days)" description="Configure the number of days old timers are kept before they are automatically removed from the timer list.">config.recording.keep_timers</item>
+			<item level="2" text="Remove finished timer logs after (days)" description="Configure the number of days old timers' log details are kept before they're automatically removed.">config.recording.keep_finished_timer_logs</item>
+			<item level="2" text="Default recording type" description="Descramble &amp; record ECM' gives the option to descramble afterwards if descrambling on recording failed. 'Don't descramble, record ECM' save a scramble recording that can be descrambled on playback. 'Normal' means descramble the recording and don't record ECM.">config.recording.ecm_data</item>
+			<item level="2" text="Record icon match" description="Select display of record icon based on 'Sref only' or 'Sref + Stream url' where applicable.">config.recording.record_icon_match</item>
+		</if>
 	</setup>
 	<setup key="playback" title="Playback">
 		<item level="2" text="Behavior when a movie is started" description="Configure the behavior when movie playback is started.">config.usage.on_movie_start</item>
@@ -352,12 +354,14 @@
 	</setup>
 	<setup key="timeshift" title="Timeshift">
 		<item level="0" text="Timeshift location" description="Set the default location for your timeshift files. Press OK to add new locations, LEFT/RIGHT to select any existing locations.">config.usage.timeshift_path</item>
-		<item level="1" text="Automatically start timeshift after" description="When enabled, timeshift starts automatically in background after the specified time.">config.timeshift.startdelay</item>
-		<item level="1" text="Show warning when timeshift is stopped" description="When enabled, a warning will be displayed and the user will get an option to stop or to continue the timeshift.">config.usage.check_timeshift</item>
-		<item level="2" text="Timeshift-save action on zap" description="Select if timeshift should continue when set to record.">config.timeshift.favoriteSaveAction</item>
-		<item level="2" text="Stop timeshift while recording?" description="Stops timeshift being used if a recording is in progress. (Advisable for USB sticks)">config.timeshift.stopwhilerecording</item>
-		<item level="2" text="Use timeshift seekbar while timeshifting?" description="If set to 'yes', allows you to use the seekbar to jump to a point within the event.">config.timeshift.showinfobar</item>
-		<item level="2" text="Skip jumping to live TV while timeshifting with plugins" description="If set to 'yes', allows you to use timeshift with alternative audio plugins.">config.usage.timeshift_skipreturntolive</item>
+		<if conditional="self.errorItem == -1">
+			<item level="1" text="Automatically start timeshift after" description="When enabled, timeshift starts automatically in background after the specified time.">config.timeshift.startdelay</item>
+			<item level="1" text="Show warning when timeshift is stopped" description="When enabled, a warning will be displayed and the user will get an option to stop or to continue the timeshift.">config.usage.check_timeshift</item>
+			<item level="2" text="Timeshift-save action on zap" description="Select if timeshift should continue when set to record.">config.timeshift.favoriteSaveAction</item>
+			<item level="2" text="Stop timeshift while recording?" description="Stops timeshift being used if a recording is in progress. (Advisable for USB sticks)">config.timeshift.stopwhilerecording</item>
+			<item level="2" text="Use timeshift seekbar while timeshifting?" description="If set to 'yes', allows you to use the seekbar to jump to a point within the event.">config.timeshift.showinfobar</item>
+			<item level="2" text="Skip jumping to live TV while timeshifting with plugins" description="If set to 'yes', allows you to use timeshift with alternative audio plugins.">config.usage.timeshift_skipreturntolive</item>
+		</if>
 	</setup>
 	<setup key="epgchannel" title="Channel EPG">
 		<item level="2" text="Sort list by" description="You can have the list sorted by time or alphanumerical.">config.epgselection.sort</item>

From 61c133ca2662aa94105b29fb8d3759224c08eb4f Mon Sep 17 00:00:00 2001
From: openvix-build <openvix-build@moralet.com>
Date: Thu, 14 Dec 2023 12:00:44 +0000
Subject: [PATCH 10/11] openvix: developer 6.4.011.001

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 01fba4bdb2..e861d29c07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1218,3 +1218,4 @@ openvix: developer 6.4.010.016
 openvix: developer 6.4.010.017
 openvix: developer 6.4.010.018
 openvix: developer 6.4.010.019
+openvix: developer 6.4.011.001

From 03e5e4242f092703f33e14ef5aef0add8fb26fe8 Mon Sep 17 00:00:00 2001
From: Orlandoxx <95180049+Orlandoxx@users.noreply.github.com>
Date: Thu, 14 Dec 2023 18:44:01 +0200
Subject: [PATCH 11/11] Updated Finnish (fi.po) translation.

Added 'Playback' changes.
---
 po/fi.po | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index 1d0449ea6b..ebbfe70aa8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: enigma2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-27 23:35+0000\n"
-"PO-Revision-Date: 2023-12-10 10:20+0200\n"
+"PO-Revision-Date: 2023-12-14 18:36+0200\n"
 "Last-Translator: Orlandox\n"
 "Language-Team: timoj/Kojo/Samzam/Orlandox\n"
 "Language: fi\n"
@@ -10514,7 +10514,7 @@ msgid "Record time limited due to conflicting timer %s"
 msgstr "Ajastusaika rajoitettu, ristiriita ajastukseen %s"
 
 msgid "Recording"
-msgstr "Tallenne"
+msgstr "Tallennus"
 
 msgid "Recording & Playback"
 msgstr "Tallennus ja toisto"
@@ -13540,7 +13540,7 @@ msgstr ""
 "Suomenkielinen käännös: timoj, Kojo, Samzam, Orlandox\n"
 "\n"
 "Ylläpito : Orlandox\n"
-"10.12.2023\n"
+"14.12.2023\n"
 "http://www.huoltovalikko.com"
 
 msgid "TS file is too large for ISO9660 level 1!"
@@ -19168,3 +19168,6 @@ msgstr "Vain Sref"
 
 msgid "Sref + stream url"
 msgstr "Sref + striimin url"
+
+msgid "Playback"
+msgstr "Toisto"