Index: server/HTML/EN/settings/player/alarm.html
===================================================================
--- server/HTML/EN/settings/player/alarm.html	(revision 29143)
+++ server/HTML/EN/settings/player/alarm.html	(working copy)
@@ -8,9 +8,10 @@
 [% END; END %]
 [% BLOCK alarmSetting %]
 	[% WRAPPER settingSection %]
-
 		[% alarmTitle = (alarmTitle ? alarmTitle : "ALARM_ALARM") | string %]
+		[% alarmName = alarm.name ? alarm.name : alarmTitle _ " " _ loop.count %]
 		[% WRAPPER settingGroup title=alarmTitle _ " " _ loop.count desc="" %]
+			<input type="text" class="stdedit" name="alarm_name[% alarm.id %]" id="alarm_name[% alarm.id %]" value="[% alarmName %]" size="20" maxlength="32">
 			<select class="stdedit" name="alarm_enable[% alarm.id %]" id="alarm_enable[% alarm.id %]">
 		
 				[% FOREACH option = {
Index: server/Slim/Buttons/Alarm.pm
===================================================================
--- server/Slim/Buttons/Alarm.pm	(revision 29143)
+++ server/Slim/Buttons/Alarm.pm	(working copy)
@@ -140,6 +140,13 @@
 
 	},
 	{
+		title	=> 'ALARM_NAME',
+		type	=> 'text',
+		item	=> sub {  
+				return $_[1]->name;
+			},
+	},
+	{
 		title	=> 'ALARM_DELETE',
 		type	=> 'menu',
 		items	=> \@deleteMenu,
@@ -322,7 +329,7 @@
 	my $count = 0;
 	foreach my $alarm (@alarms) {
 		$count++;
-		my $name = $client->string('ALARM_ALARM') . " $count";
+		my $name = $alarm->name ? $alarm->name : $client->string('ALARM_ALARM') . " $count";
 		my $item = {
 				title		=> $name . ' (' . $alarm->displayStr . ')',
 				stringTitle	=> 1,
@@ -544,6 +551,40 @@
 			# Supply a unique mode name to INPUT.Choice so it can keep track of where the user is
 			#$modeParams{modeName} = 'alarm_' . $item->{title} . $client->modeParam('alarm_depth');
 
+		} elsif ($type eq 'text') {
+			$nextMode = 'INPUT.Text';
+
+			my $valueref;
+			if (ref $item->{item} eq 'CODE') {
+				$valueref = $item->{item}->($client, $client->modeParam('alarm_alarm')) || 'A';
+			} else {
+				$valueref = $item->{item} || 'A';
+			}
+	
+			# set cursor position to end of playlist title if the playlist is known
+			my $cursorpos = $item->{item} ?  length($valueref) : 0;
+			$modeParams{valueRef} = \$valueref;
+			
+			# Use menu title for the time mode's header
+			$modeParams{header} = $item->{title};
+			$modeParams{stringHeader} = 1;
+			$modeParams{charsRef} = 'BOTH',
+			$modeParams{numberLetterRef} = 'BOTH',
+			$modeParams{cursorPos} = $cursorpos;
+			$modeParams{alarm_alarm} = $client->modeParam('alarm_alarm');
+			$modeParams{callback} = sub {
+				my $client = shift;
+				my $alarm = $client->modeParam('alarm_alarm');
+				$alarm->name($valueref);
+				
+				$client->showBriefly( {
+					line => [ $client->string('ALARM_SAVING') ]
+				});
+				saveAlarm($client, $alarm);
+				Slim::Buttons::Common::popMode($client);
+				$client->modeParam('header',$valueref);
+			};
+
 		} elsif ($type eq 'time') {
 			$nextMode = 'INPUT.Time';
 
Index: server/Slim/Control/Commands.pm
===================================================================
--- server/Slim/Control/Commands.pm	(revision 29143)
+++ server/Slim/Control/Commands.pm	(working copy)
@@ -77,7 +77,7 @@
 	my $client      = $request->client();
 	my $cmd         = $request->getParam('_cmd');
 
-	my @tags = qw( id dow dowAdd dowDel enabled repeat time volume playlisturl url cmd );
+	my @tags = qw( id dow dowAdd dowDel enabled repeat time volume playlisturl name url cmd );
 
 	# legacy support for "bare" alarm cli command (i.e., sending all tagged params)
 	my $params;
@@ -189,6 +189,7 @@
 			$alarm->volume($params->{volume}) if defined $params->{volume};
 			$alarm->enabled($params->{enabled}) if defined $params->{enabled};
 			$alarm->repeat($params->{repeat}) if defined $params->{repeat};
+			$alarm->name($params->{name}) if defined $params->{name};
 
 			# handle dow tag, if defined
 			if ( defined $params->{dow} ) {
Index: server/Slim/Control/Jive.pm
===================================================================
--- server/Slim/Control/Jive.pm	(revision 29143)
+++ server/Slim/Control/Jive.pm	(working copy)
@@ -797,7 +797,7 @@
 	my $client  = $request->client();
 	my $params;
 
-	my @tags = qw( id enabled days time playlist );
+	my @tags = qw( id enabled days time playlist name );
 	for my $tag (@tags) {
 		$params->{$tag} = $request->getParam($tag);
 	}
@@ -927,6 +927,31 @@
 	};
 	push @menu, $repeatOff;
 
+	my $alarmName = {
+		text           => $client->string('ALARM_NAME'),
+		id             => 'settingsAlarmNameChange',
+		node           => 'settings',
+		input          => {
+			initialText  => $alarm->name(),
+			len          => 1, # For those that want to name their player "X"
+			allowedChars => $client->string('JIVE_ALLOWEDCHARS_WITHCAPS'),
+			softbutton1  => $client->string('INSERT'),
+			softbutton2  => $client->string('DELETE'),
+		},
+		actions        => {
+			do =>   {
+				player => 0,
+				cmd    => [ 'alarm', 'update' ],
+				params => {
+					id   => $params->{id},
+					name => '__TAGGEDINPUT__',
+				},
+			},
+		},
+		window         => { titleStyle => 'settings' },
+	};
+	push @menu, $alarmName;
+
 	my @delete_menu= (
 		{
 			text    => $client->string('CANCEL'),
@@ -1025,7 +1050,7 @@
 		for (0..6) {
 			push @days, $_ if $alarm->day($_);
 		}
-		my $name = $client->string('ALARM_ALARM') . " $count: " . $alarm->displayStr;
+		my $name = ($alarm->name ? $alarm->name.": " : $client->string('ALARM_ALARM') . " $count: ") . $alarm->displayStr;
 		my $daysString = join(',', @days);
 		my $thisAlarm = {
 			text           => $name,
@@ -1037,7 +1062,8 @@
 						enabled  => $alarm->enabled || 0,
 						days     => $daysString,
 						time     => $alarm->time || 0,
-						playlist => $alarm->playlist || 0, # don't pass an undef to jive
+						playlist => $alarm->playlist || 0,
+						name     => $alarm->name || 0, # don't pass an undef to jive
 					},
 					player => 0,
 				},
Index: server/Slim/Utils/Alarm.pm
===================================================================
--- server/Slim/Utils/Alarm.pm	(revision 29143)
+++ server/Slim/Utils/Alarm.pm	(working copy)
@@ -125,6 +125,7 @@
 		_nextDue => undef,
 		_timeoutTimer => undef, # Timer ref to the alarm timeout timer
 		_createTime => Time::HiRes::time,
+		_name => undef,
 	};
 
 	bless $self, $class;
@@ -221,6 +222,21 @@
 	return $all;
 }
 
+=head3 name( )
+
+Sets/returns friendly name for alarm.
+
+=cut
+
+sub name {
+	my $self = shift;
+	my $newValue = shift;
+	
+	$self->{_name} = $newValue if defined $newValue;
+	
+	return $self->{_name};
+}
+
 =head3 enabled( [ 0/1 ] )
 
 Sets/returns whether this alarm is enabled.  Disabled alarms will never sound.
@@ -1055,6 +1071,7 @@
 		_comment => $self->{_comment},
 		_id => $self->{_id},
 		_createTime => $self->{_createTime},
+		_name => $self->{_name},
 	};
 }
 
@@ -1336,6 +1353,7 @@
 		$alarm->{_volume} = $prefAlarm->{_volume};
 		$alarm->{_comment} = $prefAlarm->{_comment};
 		$alarm->{_id} = $prefAlarm->{_id};
+		$alarm->{_name} = $prefAlarm->{_name};
 		# Fix up createTime for alarms that pre-date its introduction
 		my $needsSaving = 0;
 		if (! defined $prefAlarm->{_createTime}) {
Index: server/Slim/Web/Settings/Player/Alarm.pm
===================================================================
--- server/Slim/Web/Settings/Player/Alarm.pm	(revision 29143)
+++ server/Slim/Web/Settings/Player/Alarm.pm	(working copy)
@@ -163,6 +163,7 @@
 	$alarm->time($t);
 	$alarm->enabled( $paramRef->{'alarm_enable' . $id} );
 	$alarm->repeat( $paramRef->{'alarm_repeat' . $id} );
+	$alarm->name( $paramRef->{'alarm_name' . $id} );
 
 	for my $day (0 .. 6) {
 
Index: server/strings.txt
===================================================================
--- server/strings.txt	(revision 29143)
+++ server/strings.txt	(working copy)
@@ -1686,6 +1686,9 @@
 	RU	Использовать текущий плей-лист
 	SV	Använd aktuell spellista
 
+ALARM_NAME
+	EN	Alarm Name
+
 ALARM_VOLUME
 	CS	Hlasitost budíku
 	DA	Lydstyrke for vækkeur