From db59c9434535803f82ab8e6e5d6c050bf212360c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 22 Jun 2011 04:00:27 +0200
Subject: [PATCH] xbmc-addon-settings: remove SABnzbd and tvheadend settings

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../xbmc-addon-settings/source/addon.xml           |  2 +-
 .../xbmc-addon-settings/source/default.py          |  2 +-
 .../source/resources/language/Dutch/strings.xml    | 10 ----------
 .../source/resources/language/English/strings.xml  | 10 ----------
 .../source/resources/language/French/strings.xml   | 10 ----------
 .../source/resources/language/German/strings.xml   | 10 ----------
 .../resources/language/Norwegian/strings.xml       | 10 ----------
 .../source/resources/settings.xml                  | 14 --------------
 8 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/packages/mediacenter/xbmc-addon-settings/source/addon.xml b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
index e906c3cfb3..d655bcf87e 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/addon.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="os.openelec.settings"
        name="OpenELEC OS Settings"
-       version="0.0.8"
+       version="0.0.9"
        provider-name="openelec.tv">
   <requires>
     <import addon="os.openelec.tv" version="@OS_VERSION@"/>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/default.py b/packages/mediacenter/xbmc-addon-settings/source/default.py
index ba0e9bfbc6..ae4715017a 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/default.py
+++ b/packages/mediacenter/xbmc-addon-settings/source/default.py
@@ -27,7 +27,7 @@ __author__ = "OpenELEC"
 __url__ = "http://www.openelec.tv"
 __svn_url__ = ""
 __credits__ = ""
-__version__ = "0.0.8"
+__version__ = "0.0.9"
 __XBMC_Revision__ = "22240"
 
 __settings__   = xbmcaddon.Addon(id='os.openelec.settings')
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index ca62f7c5d1..5e16b5ce7e 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -34,20 +34,10 @@
 	<string id="2153">WLAN beveiliging</string>
 	<string id="2154">WLAN wachtwoord</string>
 
-	<!-- TV_SERVER -->
-	<string id="4100">TV/PVR</string>
-	<string id="4110">Configuratie</string>
-	<string id="4111">Start TV Server bij het opstarten</string>
-
 	<!-- SAMBA -->
 	<string id="5000">Samba</string>
 	<string id="5010">Configuratie</string>
 	<string id="5011">Start Samba bij het opstarten</string>
 
-	<!-- SABnzbd -->
-	<string id="5200">SABnzbd</string>
-	<string id="5210">Configuratie</string>
-	<string id="5211">Start SABnzbd bij het opstarten</string>
-
 </strings>
 
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index 0332bf6a38..77250dd2a2 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -34,19 +34,9 @@
 	<string id="2153">WLAN Security</string>
 	<string id="2154">WLAN Passphrase</string>
 
-	<!-- TV_SERVER -->
-	<string id="4100">TV/PVR</string>
-	<string id="4110">Boot</string>
-	<string id="4111">Start TV Server at boot</string>
-
 	<!-- SAMBA -->
 	<string id="5000">Samba</string>
 	<string id="5010">Boot</string>
 	<string id="5011">Start Samba at boot</string>
 
-	<!-- SABnzbd -->
-	<string id="5200">SABnzbd</string>
-	<string id="5210">Boot</string>
-	<string id="5211">Start SABnzbd at boot</string>
-
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index 7931a6d696..6b09a8f75a 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -34,19 +34,9 @@
 	<string id="2153">Sécurité WIFI</string>
 	<string id="2154">Passphrase</string>
 
-	<!-- TV_SERVER -->
-	<string id="4100">TV/PVR</string>
-	<string id="4110">Démarrage</string>
-	<string id="4111">Lancer le serveur TV au démarrage</string>
-
 	<!-- SAMBA -->
 	<string id="5000">Samba</string>
 	<string id="5010">Démarrage</string>
 	<string id="5011">Lancer Samba au démarrage</string>
 
-	<!-- SABnzbd -->
-	<string id="5200">SABnzbd</string>
-	<string id="5210">Démarrage</string>
-	<string id="5211">Lancer SABnzbd au démarrage</string>
-
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
index f31633a4b4..c6a80bb80b 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
@@ -34,19 +34,9 @@
 <string id="2153">WLAN Sicherheit</string>
 <string id="2154">WLAN Passwort</string>
 
-<!-- TV_SERVER -->
-<string id="4100">TV/PVR</string>
-<string id="4110">TV Server</string>
-<string id="4111">Starte TV Server beim Booten</string>
-
 <!-- SAMBA -->
 <string id="5000">Samba</string>
 <string id="5010">Samba Server</string>
 <string id="5011">Starte Samba beim Booten</string>
 
-<!-- SABnzbd -->
-<string id="5200">SABnzbd</string>
-<string id="5210">SABnzbd Newsgroup Downloader</string>
-<string id="5211">Starte SABnzbd beim Booten</string>
-
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
index bc59a1a486..d6fedf81ed 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
@@ -34,19 +34,9 @@
 	<string id="2153">WLAN Sikkerhet</string>
 	<string id="2154">WLAN Passord</string>
 
-	<!-- TV_SERVER -->
-	<string id="4100">TV/PVR</string>
-	<string id="4110">Oppstart</string>
-	<string id="4111">Start TV Serveren under oppstart</string>
-
 	<!-- SAMBA -->
 	<string id="5000">Samba</string>
 	<string id="5010">Oppstart</string>
 	<string id="5011">Start Samba under oppstart</string>
 
-	<!-- SABnzbd -->
-	<string id="5200">SABnzbd</string>
-	<string id="5210">Oppstart</string>
-	<string id="5211">Start SABnzbd under oppstart</string>
-
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index 00be2bba7e..bd765f88fc 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -44,24 +44,10 @@
 		<setting id="NET_PASSPHRASE" type="text" option="hidden" label="2154" default=""  enable="!eq(-1,0)"/>
     </category>
 
-   <!-- TV-SERVER -->
-<!-- 	<category label="4100"> -->
-<!-- 		<setting label="4110" type="lsep"/> -->
-<!-- 		<setting type="sep" /> -->
-<!-- 		<setting id="TVHEADEND_START" type="bool" label="4111" default="false" /> -->
-<!--     </category> -->
-
    <!-- SAMBA -->
     <category label="5000">
 		<setting label="5010" type="lsep"/>
 		<setting type="sep" />
 		<setting id="SAMBA_START" type="bool" label="5011" default="true" />
     </category>
-
-   <!-- SABnzbd -->
-    <category label="5200">
-		<setting label="5210" type="lsep"/>
-		<setting type="sep" />
-		<setting id="SABNZBD_START" type="bool" label="5211" default="false" />
-	</category>
 </settings>