diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
index be674c98cc..b9ae32fb86 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Danish/strings.xml
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN sikkerhed</string>
 	<string id="2154">WLAN kodeord</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Opstart</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Start Samba ved opstart af systemet</string>
 
 </strings>
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 86b553b2f8..a4d734b9a2 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
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN beveiliging</string>
 	<string id="2154">WLAN wachtwoord</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Configuratie</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Start Samba 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 b55f353595..21764ad9e8 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
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN Security</string>
 	<string id="2154">WLAN Passphrase</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Boot</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Start Samba at boot</string>
 	<string id="5012">Use Samba Passwords</string>
 	<string id="5013">Samba Username</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml
index d74cb39fd7..2fd6d51e9a 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Finnish/strings.xml
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN salaustapa</string>
 	<string id="2154">WLAN salasana</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Käynnistys</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Käynnistä Samba käynnistyksen yhteydessä</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 d7a11f5378..9cd9007f61 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
@@ -32,9 +32,9 @@
 	<string id="2153">Sécurité WIFI</string>
 	<string id="2154">Passphrase</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Démarrage</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Lancer Samba au démarrage</string>
 	<string id="5012">Utiliser un mot de passe Samba</string>
 	<string id="5013">Utilisateur Samba</string>
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 af74752d99..c82173b6cb 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
@@ -32,9 +32,9 @@
 <string id="2153">WLAN Sicherheit</string>
 <string id="2154">WLAN Passwort</string>
 
-<!-- SAMBA -->
-<string id="5000">Samba</string>
-<string id="5010">Samba Server</string>
+<!-- SERVICES -->
+<string id="5000">Services</string>
+<string id="5010">Samba</string>
 <string id="5011">Starte Samba beim Booten</string>
 
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml
index b23fc244b3..d5a2c80b50 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Hungarian/strings.xml
@@ -32,8 +32,8 @@
 	<string id="2153">WLAN biztonság</string>
 	<string id="2154">WLAN jelszó</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Bootolás</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Samba megosztás indítása bootoláskor</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 9d34d8da62..ce7475fffb 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
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN Sikkerhet</string>
 	<string id="2154">WLAN Passord</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Oppstart</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Start Samba under oppstart</string>
 
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml
index eff1242284..bfb09306b7 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Polish/strings.xml
@@ -32,9 +32,9 @@
 	<string id="2153">Zabezpieczenia sieci WLAN</string>
 	<string id="2154">Hasło sieci WLAN</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Start systemu</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Uruchom Sambę przy starcie systemu</string>
 
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml
index 403e9211fd..27d98faac3 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Spanish/strings.xml
@@ -32,9 +32,9 @@
 	<string id="2153">Seguridad WLAN</string>
 	<string id="2154">Clave WLAN</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Arranque</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Activar Samba al arranque</string>
 
 </strings>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml
index a049a39728..df6a09fd66 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Turkish/strings.xml
@@ -32,9 +32,9 @@
 	<string id="2153">WLAN Güvenliği</string>
 	<string id="2154">WLAN Parolası</string>
 
-	<!-- SAMBA -->
-	<string id="5000">Samba</string>
-	<string id="5010">Önyükleme</string>
+	<!-- SERVICES -->
+	<string id="5000">Services</string>
+	<string id="5010">Samba</string>
 	<string id="5011">Samba'yı önyüklemede başlat</string>
 	<string id="5012">Samba İçin Parola Kullan</string>
 	<string id="5013">Samba Kullanıcı adı</string>
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index cfac9bd349..baa65ac557 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -62,7 +62,7 @@
 		<setting id="NET2_PASSPHRASE" type="text" option="hidden" label="2154" default=""  visible="!eq(-1,0) + !eq(-2,) + eq(-14,2)"/>
   </category>
 
-   <!-- SAMBA -->
+   <!-- SERVICES -->
     <category label="5000">
 		<setting label="5010" type="lsep"/>
 		<setting type="sep" />