diff options
| author | Arne Morten Kvarving <spiff@xbmc.org> | 2012-10-15 15:23:07 -0700 |
|---|---|---|
| committer | Arne Morten Kvarving <spiff@xbmc.org> | 2012-10-15 15:23:07 -0700 |
| commit | b2faddb6f5a4d6d2a2faf9b39c89fc08969a5e8f (patch) | |
| tree | f6117a18bc12215ff9052814bc968d7f3809b2d2 /addons | |
| parent | a3362d0dd6d7e4c673601b996e13053a17ca1200 (diff) | |
| parent | 88dd9131f3efd1e70d67964456e445f20593a538 (diff) | |
Merge pull request #1622 from jmarshallnz/skin_settings
Skin settings to a button in Appearance, under skin chooser
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/skin.confluence/720p/Settings.xml | 6 | ||||
| -rw-r--r-- | addons/skin.confluence/720p/SkinSettings.xml (renamed from addons/skin.confluence/720p/custom_SkinSetting_1111.xml) | 2 | ||||
| -rw-r--r-- | addons/skin.confluence/language/English/strings.po | 4 |
3 files changed, 2 insertions, 10 deletions
diff --git a/addons/skin.confluence/720p/Settings.xml b/addons/skin.confluence/720p/Settings.xml index 21d5903544..7c0a2b3c1d 100644 --- a/addons/skin.confluence/720p/Settings.xml +++ b/addons/skin.confluence/720p/Settings.xml @@ -169,12 +169,6 @@ <onclick>ActivateWindow(SystemSettings)</onclick> <icon>-</icon> </item> - <item id="10"> - <label>166</label> - <label2>31407</label2> - <onclick>ActivateWindow(1111)</onclick> - <icon>-</icon> - </item> </content> </control> <control type="image"> diff --git a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml b/addons/skin.confluence/720p/SkinSettings.xml index 5422cc1a80..375f7ace13 100644 --- a/addons/skin.confluence/720p/custom_SkinSetting_1111.xml +++ b/addons/skin.confluence/720p/SkinSettings.xml @@ -1,4 +1,4 @@ -<window id="1111"> +<window> <defaultcontrol always="true">9000</defaultcontrol> <controls> <include>CommonBackground</include> diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po index e89eb6a67e..c0ea89fcf6 100644 --- a/addons/skin.confluence/language/English/strings.po +++ b/addons/skin.confluence/language/English/strings.po @@ -510,9 +510,7 @@ 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" msgstr "" -msgctxt "#31407" -msgid "[B]CONFIGURE SKIN SETTINGS[/B][CR][CR]Setup the Confluence skin · Add and remove home menu items[CR]Change skin backgrounds" -msgstr "" +#empty string with id 31407 msgctxt "#31408" msgid "[B]CONFIGURE ADD-ONS[/B][CR][CR]Manage your installed Add-ons · Browse for and install Add-ons from xbmc.org[CR]Modify Add-on settings" |