From 0d9695641576bf6bd4f297f7d88095c362afde06 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Mon, 1 Aug 2016 18:53:21 +0100
Subject: [PATCH] bits n bobs

---
 1080i/Font.xml              |  8 +++++++-
 1080i/Settings.xml          | 24 ++++++++++++------------
 1080i/SettingsCategory.xml  |  9 ++++++---
 language/English/strings.po | 32 ++++++++++++++++++++++++--------
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/1080i/Font.xml b/1080i/Font.xml
index 2f60566..ad42639 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -153,7 +153,6 @@
             <linespacing>1.0</linespacing>
         </font>
         <font>
-
             <name>itemSubTitleCondensed</name>
             <filename>roboto/condensedBold.ttf</filename>
             <size>30</size>
@@ -171,6 +170,13 @@
             <size>28</size>
             <linespacing>1.0</linespacing>
         </font>
+        <font>
+            <name>settingsCategoryTitle</name>
+            <filename>roboto/bold.ttf</filename>
+            <size>24</size>
+            <linespacing>1.0</linespacing>
+            <style>uppercase</style>
+        </font>
         <font>
             <name>thumbTitle</name>
             <filename>roboto/regular.ttf</filename>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index aa44194..5934f4d 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -137,56 +137,56 @@
                         <description>Player Settings</description>
                         <label>$LOCALIZE[14201]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31063] • $LOCALIZE[24012]</property>
+                        <property name="label3">$LOCALIZE[31063]</property>
                         <onclick>activatewindow(PlayerSettings)</onclick>
                     </item>
                     <item>
                         <description>Library Settings</description>
                         <label>$LOCALIZE[14203]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31063] • $LOCALIZE[24012]</property>
-                        <onclick>activatewindow(LibrarySettings)</onclick>
+                        <property name="label3">$LOCALIZE[31079]</property>
+                        <onclick>activatewindow(MediaSettings)</onclick>
                     </item>
                     <item>
                         <description>PVR Settings</description>
                         <label>$LOCALIZE[14205]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31006] • $LOCALIZE[31065]</property>
+                        <property name="label3">$LOCALIZE[31081]</property>
                         <onclick>ActivateWindow(PVRSettings)</onclick>
                     </item>
                     <item>
                         <description>Services Settings</description>
                         <label>$LOCALIZE[14208]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31071] • $LOCALIZE[1273]</property>
+                        <property name="label3">$LOCALIZE[31071]</property>
                         <onclick>activatewindow(ServiceSettings)</onclick>
                     </item>
                     <item>
                         <description>Interface settings</description>
                         <label>$LOCALIZE[14207]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31061] • $LOCALIZE[24008]</property>
+                        <property name="label3">$LOCALIZE[31061]</property>
                         <onclick>activatewindow(InterfaceSettings)</onclick>
                     </item>
                     <item>
                         <description>Skin settings</description>
                         <label>$LOCALIZE[20077]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31061] • $LOCALIZE[24008]</property>
+                        <property name="label3">$LOCALIZE[31083]</property>
                         <onclick>activatewindow(SkinSettings)</onclick>
                     </item>
                     <item>
                         <description>Profiles</description>
                         <label>$LOCALIZE[14210]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31105] • $LOCALIZE[31106]</property>
+                        <property name="label3">$LOCALIZE[31103]</property>
                         <onclick>activatewindow(Profiles)</onclick>
                     </item>
                     <item>
                         <description>System</description>
                         <label>$LOCALIZE[14209]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[14094] • $LOCALIZE[14095]</property>
+                        <property name="label3">$LOCALIZE[31105]</property>
                         <onclick>activatewindow(SystemSettings)</onclick>
                     </item>
                     <item>
@@ -200,21 +200,21 @@
                         <description>File Manager</description>
                         <label>10003</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31095] • $LOCALIZE[31111]</property>
+                        <property name="label3">$LOCALIZE[31095]</property>
                         <onclick>activatewindow(1103)</onclick>
                     </item>
                     <item>
                         <description>Programs</description>
                         <label>31003</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31067]</property>
+                        <property name="label3">$LOCALIZE[31111]</property>
                         <onclick>ActivateWindow(programs,addons,return)</onclick>
                     </item>
                     <item>
                         <description>System Info</description>
                         <label>$LOCALIZE[138]</label>
                         <label2></label2>
-                        <property name="label3">$LOCALIZE[31067]</property>
+                        <property name="label3">$LOCALIZE[31108]</property>
                         <onclick>ActivateWindow(systeminfo)</onclick>
                     </item>
                 </content>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index d7bf339..6645402 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -101,9 +101,12 @@
             <control type="label" id="14">
                 <description>Default Label</description>
                 <label>-</label>
-                <align>center</align>
-                <font>buttonTitle</font>
-                <textcolor>textActive</textcolor>
+                <align>left</align>
+                <aligny>center</aligny>
+                <textoffsetx>24</textoffsetx>
+                <height>2-row</height>
+                <font>settingsCategoryTitle</font>
+                <textcolor>ff757575</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
             <control type="radiobutton" id="8">
diff --git a/language/English/strings.po b/language/English/strings.po
index a52d72e..98ab53c 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -258,7 +258,7 @@ msgid "PVR"
 msgstr ""
 
 msgctxt "#31061"
-msgid "Skin"
+msgid "Interface • Interface"
 msgstr ""
 
 msgctxt "#31062"
@@ -266,7 +266,7 @@ msgid "Memory"
 msgstr ""
 
 msgctxt "#31063"
-msgid "File Lists"
+msgid "Playback • Subtitles"
 msgstr ""
 
 msgctxt "#31064"
@@ -282,7 +282,7 @@ msgid "Audio CDs"
 msgstr ""
 
 msgctxt "#31067"
-msgid "System extensions"
+msgid "Addons • Addons"
 msgstr ""
 
 msgctxt "#31068"
@@ -298,7 +298,7 @@ msgid "Screen"
 msgstr ""
 
 msgctxt "#31071"
-msgid "Networking"
+msgid "Networking • Airplay"
 msgstr ""
 
 msgctxt "#31072"
@@ -329,14 +329,26 @@ msgctxt "#31078"
 msgid "Now and Next"
 msgstr ""
 
+msgctxt "#31079"
+msgid "Library • Library"
+msgstr ""
+
 msgctxt "#31080"
 msgid "Programme Guide"
 msgstr ""
 
+msgctxt "#31081"
+msgid "Live TV • Live TV"
+msgstr ""
+
 msgctxt "#31082"
 msgid "Version"
 msgstr ""
 
+msgctxt "#31083"
+msgid "Skin settings • Skin Settings"
+msgstr ""
+
 msgctxt "#31085"
 msgid "Add Video Addon"
 msgstr ""
@@ -358,7 +370,7 @@ msgid "Add Music Playlist"
 msgstr ""
 
 msgctxt "#31095"
-msgid "Transfer"
+msgid "Transfer • Copy Files"
 msgstr ""
 
 msgctxt "#31096"
@@ -390,11 +402,11 @@ msgid "Disable fanart animation effect"
 msgstr ""
 
 msgctxt "#31103"
-msgid "Profile Settings"
+msgid "Profile Settings • Login options"
 msgstr ""
 
 msgctxt "#31105"
-msgid "Login options"
+msgid "System settings • System settings"
 msgstr ""
 
 msgctxt "#31106"
@@ -405,6 +417,10 @@ msgctxt "#31107"
 msgid "Current profile"
 msgstr ""
 
+msgctxt "#31108"
+msgid "CPU Temp • HDD Space"
+msgstr ""
+
 msgctxt "#31109"
 msgid "Order: Ascending"
 msgstr ""
@@ -414,7 +430,7 @@ msgid "Order: Descending"
 msgstr ""
 
 msgctxt "#31111"
-msgid "Copy files"
+msgid "Programs • Programs"
 msgstr ""
 
 msgctxt "#31112"