Merge pull request xbmc#24100 from CrystalP/adjust-hdr-setting

[Settings] Adjust the "Use display HDR capabilities" setting

addons/resource.language.en_gb/resources/strings.po

@@ -7347,7 +7347,7 @@ msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#13436"
-msgid "Use display HDR capabilities"
+msgid "Adjust display HDR mode"
 msgstr ""
 
 #: system/settings/settings.xml
@@ -20212,10 +20212,10 @@ msgctxt "#36298"
 msgid "If enabled, a recording for the programme to remind will be scheduled when auto-closing the reminder popup, if supported by the PVR add-on and backend."
 msgstr ""
 
-#. Description of setting with label #13436 "Use display HDR capabilities"
+#. Description of setting with label #13436 "Adjust display HDR mode"
 #: system/settings/settings.xml
 msgctxt "#36299"
-msgid "Switch display into HDR mode if media with HDR information is played.[CR]If disabled, HDR information are applied using Kodi's internal HDR path."
+msgid "Allow the HDR mode of the display to be changed to best match the media.[CR]When disabled, Kodi applies tonemapping as needed to adapt the media to the current HDR mode of the display."
 msgstr ""
 
 #. Description of setting with label #20226 "Movie set information folder"

system/settings/settings.xml

@@ -60,6 +60,16 @@
           </constraints>
           <control type="list" format="string" />
         </setting>
+        <setting id="winsystem.ishdrdisplay" type="boolean" label="13436" help="36299">
+          <dependencies>
+            <dependency type="visible">
+              <condition on="property" name="ishdrdisplay" />
+            </dependency>
+          </dependencies>
+          <level>2</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
         <setting id="videoplayer.usedisplayasclock" type="boolean" label="13510" help="36166">
           <level>1</level>
           <default>false</default>
@@ -163,16 +173,6 @@
           <default>true</default>
           <control type="toggle" />
         </setting>
-        <setting id="winsystem.ishdrdisplay" type="boolean" label="13436" help="36299">
-          <dependencies>
-            <dependency type="visible">
-              <condition on="property" name="ishdrdisplay" />
-            </dependency>
-          </dependencies>
-          <level>2</level>
-          <default>true</default>
-          <control type="toggle" />
-        </setting>
         <setting id="videoplayer.highprecision" type="boolean" label="13418" help="39195">
           <requirement>HAS_DX</requirement>
           <level>2</level>