Index: /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/OPMLBased.pm
===================================================================
--- /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/OPMLBased.pm	(revision 19596)
+++ /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/OPMLBased.pm	(working copy)
@@ -56,7 +56,7 @@
 		
 	$cli_next{ $class }->{ $args{menu} } = Slim::Control::Request::addDispatch(
 		[ $args{menu}, '_index', '_quantity' ],
-		[ 1, 1, 1, $class->cliRadiosQuery( \%args, $args{menu} ) ]
+		[ 0, 1, 1, $class->cliRadiosQuery( \%args, $args{menu} ) ]
 	);
 }
 
@@ -95,7 +95,6 @@
 
 	return sub {
 		my $request = shift;
-		my $client  = $request->client;
 
 		my $menu = $request->getParam('menu');
 
@@ -105,7 +104,7 @@
 		# what we want the query to report about ourself
 		if (defined $menu) {
 			$data = {
-				text         => $client->string( $args->{display_name} || $class->getDisplayName() ),  # nice name
+				text         => $request->string( $args->{display_name} || $class->getDisplayName() ),  # nice name
 				weight       => $weight,
 				'icon-id'    => $icon,
 				actions      => {
@@ -124,7 +123,7 @@
 		else {
 			$data = {
 				cmd  => $tag,
-				name => $client->string( $class->getDisplayName() ),
+				name => $request->string( $class->getDisplayName() ),
 				type => 'xmlbrowser',
 			};
 		}
Index: /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/RadioTime/Plugin.pm
===================================================================
--- /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/RadioTime/Plugin.pm	(revision 19596)
+++ /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/RadioTime/Plugin.pm	(working copy)
@@ -52,7 +52,7 @@
 	Slim::Control::Request::addDispatch(['radiotime', 'playlist', '_method' ],
 		[1, 1, 1, \&cliQuery]);
 	$cli_next = Slim::Control::Request::addDispatch(['radios', '_index', '_quantity' ],
-		[1, 1, 1, \&cliRadiosQuery]);
+		[0, 1, 1, \&cliRadiosQuery]);
 	Slim::Web::HTTP::protectCommand([qw|radiotime radios|]);
 }
 
@@ -141,7 +141,6 @@
 
 sub cliRadiosQuery {
 	my $request = shift;
-	my $client  = $request->client;
 	
 	my $menu = $request->getParam('menu');
 
@@ -149,7 +148,7 @@
 	# what we want the query to report about ourself
 	if (defined $menu) {
 		$data = {
-			'text'    => $client->string( getDisplayName() ),  # nice name
+			'text'    => $request->string( getDisplayName() ),  # nice name
 			weight    => 30,
 			'icon-id' => Slim::Plugin::RadioTime::Plugin->_pluginDataFor('icon'),
 			'actions' => {
@@ -168,7 +167,7 @@
 	else {
 		$data = {
 			'cmd'  => 'radiotime',
-			'name' => $client->string( getDisplayName() ),
+			'name' => $request->string( getDisplayName() ),
 			'type' => 'xmlbrowser',
 		};
 	}
Index: /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/ShoutcastBrowser/Plugin.pm
===================================================================
--- /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/ShoutcastBrowser/Plugin.pm	(revision 19596)
+++ /Users/mh/Documents/workspace/trunk/server/Slim/Plugin/ShoutcastBrowser/Plugin.pm	(working copy)
@@ -40,7 +40,7 @@
 	Slim::Control::Request::addDispatch(['shoutcast', 'playlist', '_method' ],
 		[1, 1, 1, \&cliQuery]);
 	$cli_next = Slim::Control::Request::addDispatch(['radios', '_index', '_quantity' ],
-		[1, 1, 1, \&cliRadiosQuery]);
+		[0, 1, 1, \&cliRadiosQuery]);
 
 	$class->SUPER::initPlugin();
 }
@@ -82,7 +82,6 @@
 
 sub cliRadiosQuery {
 	my $request = shift;
-	my $client  = $request->client;
 	
 	my $menu = $request->getParam('menu');
 
@@ -90,7 +89,7 @@
 	# what we want the query to report about ourself
 	if (defined $menu) {
 		$data = {
-			'text' => $client->string( getDisplayName() ),  # nice name
+			'text' => $request->string( getDisplayName() ),  # nice name
 			'icon-id' => Slim::Plugin::ShoutcastBrowser::Plugin->_pluginDataFor('icon'),
 			'weight'  => 50,
 			'actions' => {
@@ -109,7 +108,7 @@
 	else {
 		$data = {
 			'cmd' => 'shoutcast',                    # cmd label
-			'name' => $client->string( getDisplayName() ),  # nice name
+			'name' => $request->string( getDisplayName() ),  # nice name
 			'type' => 'xmlbrowser',              # type
 		};
 	}