Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-kernel-next

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@"/>

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')

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>
 

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>

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>

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>

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>

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>

packages/sysutils/busybox/init.d/02_make-directorys

@@ -25,7 +25,6 @@
 
 progress "make variable directory structure"
   mkdir -p /var/cache \
-           /var/log \
            /var/lock \
            /var/media \
            /var/run \
@@ -38,6 +37,13 @@ progress "make variable directory structure"
   touch /var/run/utmp
     chmod 1777 /var/run/utmp
 
+  if test "$DEBUG" = "yes"; then
+    mkdir -p $HOME/log
+    ln -sf $HOME/log /var/log
+  else
+    mkdir -p /var/log
+  fi
+
   touch /var/log/wtmp
     chmod 1777 /var/log/wtmp