Index: src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
===================================================================
--- src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua	(revision 8672)
+++ src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua	(working copy)
@@ -24,7 +24,7 @@
 local Textarea         = require("jive.ui.Textarea")
 local Window           = require("jive.ui.Window")
 
-local debug            = require("jive.utils.debug")
+-- local debug            = require("jive.utils.debug")
 
 
 local jnt = jnt
@@ -91,11 +91,17 @@
 	  ["24"] = "BATT_CHARGING_PAUSED",
 }
 
-function setValue(self, key, value)
+function setValue(self, key, value, arg)
 	if not value then
 		value = '-'
 	end
-	self.diagMenu:setText(self.labels[key], self:string(key, value))
+
+	-- if we have customLabelArgs, we want to insert those first to the string args
+	if arg then
+		self.diagMenu:setText(self.labels[key], self:string(key, arg, value))
+	else
+		self.diagMenu:setText(self.labels[key], self:string(key, value))
+	end
 end
 
 
@@ -107,9 +113,9 @@
 end
 
 
-function serverPort(self, server, port, key)
+function serverPort(self, server, port, key, arg)
 	if not server then
-		self:setValue(key, self.notConnected)
+		self:setValue(key, self.notConnected, arg)
 		return
 	end
 
@@ -126,7 +132,7 @@
 		end
 
 		if ip == nil then
-			self:setValue(key, portFail)
+			self:setValue(key, portFail, arg)
 			return
 		end
 
@@ -137,9 +143,9 @@
 			local res, err = tcp.t_sock:send(" ")
 
 			if err then
-				self:setValue(key, portFail)
+				self:setValue(key, portFail, arg)
 			else
-				self:setValue(key, portOk)
+				self:setValue(key, portOk, arg)
 			end
 
 			tcp:close()
@@ -388,12 +394,14 @@
 		self:setValue("SC_ADDRESS", self.notConnected)
 		self:setValue("SC_PING", self.notConnected)
 		self:setValue("SC_PORT_3483", self.notConnected)
-		self:setValue("SC_PORT_9000", self.notConnected)
+		self:setValue("SC_PORT_9000", self.notConnected, "9000") -- guess at 9000 here 
 	else
 		self:setValue("SC_NAME", sc:getName())
 		self:serverPing(sc, "SC_ADDRESS", "SC_PING")
 		self:serverPort(sc, 3483, "SC_PORT_3483")
-		self:serverPort(sc, 9000, "SC_PORT_9000")
+		local ip, port = sc:getIpPort()
+		port = port or 9000
+		self:serverPort(sc, port, "SC_PORT_9000", tostring(port))
 	end
 
 
@@ -472,7 +480,7 @@
 	for i,name in ipairs(tests) do
 		if name ~= 'ETH_CONNECTION' or System:getMachine() ~= 'jive' then
 			self.labels[name] = {
-				text = self:string(name, ''),
+				text = self:string(name, '', ''),
 				style = 'item_info',
 			}
 			menu:addItem(self.labels[name])
Index: src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
===================================================================
--- src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt	(revision 8672)
+++ src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt	(working copy)
@@ -529,19 +529,19 @@
 	SV	TCP-port 3483\n%s
 
 SC_PORT_9000
-	CS	TCP port 9000\n%s
-	DA	TCP-port 9000\n%s
-	DE	TCP-Anschluss 9000\n%s
-	EN	TCP port 9000\n%s
-	ES	Puerto TCP 9000\n%s
-	FI	TCP-portti 9000\n%s
-	FR	Port TCP 9000\n%s
-	IT	Porta TCP 9000\n%s
-	NL	TCP-poort 9000\n%s
-	NO	TCP-port 9000\n%s
-	PL	Port TCP 9000\n%s
-	RU	TCP-порт 9000\n%s
-	SV	TCP-port 9000\n%s
+	CS	TCP port %s\n%s
+	DA	TCP-port %s\n%s
+	DE	TCP-Anschluss %s\n%s
+	EN	TCP port %s\n%s
+	ES	Puerto TCP %s\n%s
+	FI	TCP-portti %s\n%s
+	FR	Port TCP %s\n%s
+	IT	Porta TCP %s\n%s
+	NL	TCP-poort %s\n%s
+	NO	TCP-port %s\n%s
+	PL	Port TCP %s\n%s
+	RU	TCP-порт %s\n%s
+	SV	TCP-port %s\n%s
 
 SUPPORT
 	CS	Další nápověda