[CORE] settings refactor

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

@@ -394,7 +394,7 @@ msgid "Yes"
 msgstr ""
 
 msgctxt "#108"
-msgid "Slideshow"
+msgid "Picture Slideshow"
 msgstr ""
 
 msgctxt "#109"
@@ -634,9 +634,7 @@ msgctxt "#156"
 msgid "Free"
 msgstr ""
 
-msgctxt "#157"
-msgid "Video"
-msgstr ""
+#empty string with id 157
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
 msgctxt "#158"
@@ -6869,7 +6867,7 @@ msgstr ""
 
 #: system/settings/settings.xml
 msgctxt "#14087"
-msgid "Discs"
+msgid "DVD / BluRay"
 msgstr ""
 
 #: system/settings/settings.xml
@@ -6938,7 +6936,7 @@ msgstr ""
 #. Name of a settings category related to video playback
 #: system/settings/settings.xml
 msgctxt "#14101"
-msgid "Acceleration"
+msgid "Video Acceleration"
 msgstr ""
 
 #. Name of a setting for Blu-ray playback mode
@@ -14143,7 +14141,7 @@ msgstr ""
 #. Description of settings section "Videos" with label #3
 #: system/settings/settings.xml
 msgctxt "#36138"
-msgid "Section that contains settings related to videos and how they are handled."
+msgid "Section that contains settings related to playback in Kodi."
 msgstr ""
 
 #. Description of settings category "Videos -> Library" with label #14022
@@ -14742,7 +14740,7 @@ msgstr ""
 #. Description of settings section "Music" with label #2
 #: system/settings/settings.xml
 msgctxt "#36253"
-msgid "Section that contains settings related to music files and how they are handled."
+msgid "Section that contains settings related to your library and media."
 msgstr ""
 
 #empty string with id 36254
@@ -16394,7 +16392,43 @@ msgctxt "#37045"
 msgid "Extract chapter thumbnails for presentation in the chapters/bookmarks dialog. This might increase CPU load."
 msgstr ""
 
-#empty strings from id 37046 to 38009
+#. Category #37044 Settings -> Media Management
+#: system/settings/settings.xml
+msgctxt "#37046"
+msgid "Music Library"
+msgstr ""
+
+#. Category #37045 Settings -> Media Management
+#: system/settings/settings.xml
+msgctxt "#37047"
+msgid "Music Files"
+msgstr ""
+
+#. Category #37046 Settings -> Media Management
+#: system/settings/settings.xml
+msgctxt "#37048"
+msgid "Video Library"
+msgstr ""
+
+#. Category #37047 Settings -> Media Management
+#: system/settings/settings.xml
+msgctxt "#37049"
+msgid "Video Files"
+msgstr ""
+
+#. Category #37047 Settings -> Media Management
+#: system/settings/settings.xml
+msgctxt "#37050"
+msgid "Picture Files"
+msgstr ""
+
+#. Category #37047 Settings -> Media Management
+#: settings.xml
+msgctxt "#37051"
+msgid "Media Management"
+msgstr ""
+
+#empty strings from id 37052 to 38009
 
 #: system/settings/rbp.xml
 msgctxt "#38010"

addons/skin.confluence/720p/Settings.xml

@@ -123,48 +123,36 @@
 						<icon>-</icon>
 					</item>
 					<item id="2">
-						<label>157</label>
+						<label>14086</label>
 						<label2>31401</label2>
-						<onclick>ActivateWindow(VideosSettings)</onclick>
+						<onclick>ActivateWindow(PlaybackSettings)</onclick>
 						<icon>-</icon>
 					</item>
 					<item id="3">
+						<label>37051</label>
+						<label2>31402</label2>
+						<onclick>ActivateWindow(MediaSettings)</onclick>
+						<icon>-</icon>
+					</item>
+					<item id="4">
 						<label>31502</label>
 						<label2>31409</label2>
 						<onclick>ActivateWindow(PVRSettings)</onclick>
 						<icon>special://skin/backgrounds/tv.jpg</icon>
 					</item>
-					<item id="4">
-						<label>2</label>
-						<label2>31402</label2>
-						<onclick>ActivateWindow(MusicSettings)</onclick>
-						<icon>-</icon>
-					</item>
 					<item id="5">
-						<label>1</label>
-						<label2>31403</label2>
-						<onclick>ActivateWindow(PicturesSettings)</onclick>
-						<icon>-</icon>
-					</item>
-					<item id="6">
-						<label>8</label>
-						<label2>31404</label2>
-						<onclick>ActivateWindow(WeatherSettings)</onclick>
-						<icon>-</icon>
-					</item>
-					<item id="7">
 						<label>24001</label>
 						<label2>31408</label2>
 						<onclick>ActivateWindow(AddonBrowser)</onclick>
 						<icon>-</icon>
 					</item>
-					<item id="8">
+					<item id="6">
 						<label>14036</label>
 						<label2>31410</label2>
 						<onclick>ActivateWindow(ServiceSettings)</onclick>
 						<icon>-</icon>
 					</item>
-					<item id="9">
+					<item id="7">
 						<label>13000</label>
 						<label2>31406</label2>
 						<onclick>ActivateWindow(SystemSettings)</onclick>

addons/skin.confluence/language/English/strings.po

@@ -506,29 +506,21 @@ msgstr ""
 #Description Labels
 
 msgctxt "#31400"
-msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set language and region · Change file listing options[CR]Set up a screensaver"
+msgid "[B]CONFIGURE APPEARANCE SETTINGS[/B][CR][CR]Change the skin · Set up a screensaver"
 msgstr ""
 
 msgctxt "#31401"
-msgid "[B]CONFIGURE VIDEO SETTINGS[/B][CR][CR]Manage your video library · Set video playback options · Change video listing options[CR]Set subtitle fonts"
+msgid "[B]CONFIGURE PLAYBACK SETTINGS[/B][CR][CR]Set disc playback options · Set music playback options · Set video playback options[CR]Set karaoke options · Set subtitle fonts"
 msgstr ""
 
 msgctxt "#31402"
-msgid "[B]CONFIGURE MUSIC SETTINGS[/B][CR][CR]Manage your music library · Set music playback options · Change music listing options[CR]Setup song submission · Set karaoke options"
+msgid "[B]CONFIGURE MEDIA SETTINGS[/B][CR][CR]Change file listing options · Manage your music library · Manage your video library[CR]Set picture listing options · Configure slideshows"
 msgstr ""
 
-msgctxt "#31403"
-msgid "[B]CONFIGURE PICTURE SETTINGS[/B][CR][CR]Set picture listing options · Configure slideshows"
-msgstr ""
-
-msgctxt "#31404"
-msgid "[B]CONFIGURE WEATHER SETTINGS[/B][CR][CR]Set three cities to collect weather information"
-msgstr ""
-
-#empty string with id 31405
+#empty strings from id 31403 to 31405
 
 msgctxt "#31406"
-msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Setup and calibrate displays · Configure audio output · Setup remote controls[CR]Set power saving options · Enable debugging · Setup master lock"
+msgid "[B]CONFIGURE SYSTEM SETTINGS[/B][CR][CR]Set language and region · Setup and calibrate displays · Configure audio output · Setup remote controls · Set power saving options · Enable debugging · Setup master lock"
 msgstr ""
 
 #empty string with id 31407

system/settings/android.xml

@@ -7,7 +7,7 @@
       </group>
     </category>
   </section>
-  <section id="videos">
+  <section id="playback">
     <category id="videoacceleration">
       <group id="3">
         <setting id="videoplayer.usestagefright" type="boolean" parent="videoplayer.decodingmethod" label="13436" help="36260">

system/settings/darwin_ios.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-  <section id="videos">
+  <section id="playback">
     <category id="videoplayer">
       <group id="3">
         <setting id="videoplayer.adjustrefreshrate">
@@ -18,8 +18,6 @@
         </setting>
       </group>
     </category>
-  </section>
-  <section id="music">
     <category id="audiocds">
       <visible>false</visible>
     </category>

system/settings/rbp.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <settings>
-  <section id="videos">
+  <section id="playback">
     <category id="videoacceleration">
       <group id="1">
         <visible>false</visible>
@@ -24,7 +24,6 @@
       </group>
     </category>
   </section>
-
   <section id="system">
     <category id="videoscreen">
       <group id="1">