alexey #426 translation patch

22 files changed, 73 insertions, 60 deletions

diff --git a/admin/catalog.php b/admin/catalog.php
index 8445d2ed..e4fd66f4 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -127,13 +127,13 @@ switch ($_REQUEST['action']) {
 
 		if (count($song)) { 
 			$catalog->remove_songs($song);
-			$body = _('Songs Removed');
+			$body = ngettext('Song Removed', 'Songs Removed', count($song));
 		}
 		else {
 			$body = _('No Songs Removed');
 		}
 		$url	= conf('web_path') . '/admin/index.php';
-		$title	= _('Disabled Songs Processed');
+		$title	= ngettext('Disabled Song Processed','Disabled Songs Processed',count($song));
 		show_confirmation($title,$body,$url);
 	break;
 	case 'clean_all_catalogs':
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 4bdd5711..b1fff9dc 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -1608,7 +1608,11 @@ class Catalog extends database_object {
 		echo "update_txt('" . $count ."','clean_count_" . $this->id . "');";
 		echo "\n</script>\n";
 		show_box_top();
-		echo "<strong>" . _('Catalog Clean Done') . " [" . $dead_files . "] " . _('files removed') . "</strong><br />\n";
+		echo "<strong>";
+		printf (ngettext('Catalog Clean Done. %d file removed.',
+		   'Catalog Clean Done. %d files removed.',
+		   $dead_files), $dead_files);
+		echo "</strong><br />\n";
 		echo "<strong>" . _('Optimizing Tables') . "...</strong><br />\n";
 		self::optimize_tables();
 		show_box_bottom();
@@ -2444,11 +2448,15 @@ class Catalog extends database_object {
 			/* Recreate the Playlist */
 			$playlist = new Playlist($playlist_id);
 			$playlist->add_songs($songs);
-			$reason = sprintf(_('Playlist Import and Recreate Successful. Total: %d Songs'), count($songs));
+			$reason = sprintf(ngettext('Playlist Import and Recreate Successful. Total: %d Song', 
+			   'Playlist Import and Recreate Successful. Total: %d Songs',
+			   count($songs)), count($songs));
 			return true;
 		}
 
-		$reason = sprintf(_('Parsing %s - Not Found: %d Songs. Please check your m3u file.'), $filename, count($songs));
+		$reason = sprintf(ngettext('Parsing %s - Not Found: %d Song. Please check your m3u file.', 
+		   'Parsing %s - Not Found: %d Songs. Please check your m3u file.',
+		   count($songs)), $filename, count($songs));
 		return false;
 
 	} // import_m3u
diff --git a/lib/gettext.php b/lib/gettext.php
index 341ab524..b22e9e71 100644
--- a/lib/gettext.php
+++ b/lib/gettext.php
@@ -62,4 +62,8 @@ function __($string,$subject,$replace) {
 
 } // __
 
+function gettext_noop($string) {
+	return $string;
+}
+
 ?>
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index c2cc0364..2e9d716d 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -624,7 +624,7 @@ function get_user_icon($name,$title='',$id='') {
 		$name = $name['0']; 
 	} 
 
-	if (!$title) { $title = $name; } 
+	if (!$title) { $title = _(ucfirst($name)); } 
 
 	if ($id) { 
 		$id_element = 'id="' . $id . '"'; 
@@ -668,7 +668,7 @@ function get_user_icon($name,$title='',$id='') {
 
 	} // end if not cached
 
-	$string = "<img src=\"$img_url\" $id_element alt=\"" . ucfirst($title) . "\" title=\"" . ucfirst($title) . "\" $hov_txt/>";
+	$string = "<img src=\"$img_url\" $id_element alt=\"" . $title . "\" title=\"" . $title . "\" $hov_txt/>";
 
 	return $string;
 
diff --git a/locale/base/gather-messages.sh b/locale/base/gather-messages.sh
index 9c3a3827..ad45bbf9 100755
--- a/locale/base/gather-messages.sh
+++ b/locale/base/gather-messages.sh
@@ -47,7 +47,7 @@ fi
 
 case $1 in
 	"--all"|"-a"|"all")
-		xgettext --from-code=UTF-8 --msgid-bugs-address="$MAILADDR" -L php -o $POTNAME `find ../../ -name \*.php -type f` `find ../../ -name \*.inc -type f`
+		xgettext --from-code=UTF-8 --msgid-bugs-address="$MAILADDR" -L php --keyword=gettext_noop -o $POTNAME `find ../../ -name \*.php -type f` `find ../../ -name \*.inc -type f`
 		OLANG=`ls ../ | grep -v base`
 		echo "add database words add to pot file..."
 		cat translation-words.txt >> messages.pot
@@ -63,7 +63,7 @@ case $1 in
 		done
 		;;
 	"--get"|"-g"|"get")
-		xgettext --from-code=UTF-8 --msgid-bugs-address="$MAILADDR" -L php -o $POTNAME `find ../../ -name \*.php -type f` `find ../../ -name \*.inc -type f`;
+		xgettext --from-code=UTF-8 --msgid-bugs-address="$MAILADDR" -L php --keyword=gettext_noop -o $POTNAME `find ../../ -name \*.php -type f` `find ../../ -name \*.inc -type f`;
 		if [ $? = 0 ]; then
 			echo "pot file creation was done.";
 		else
diff --git a/register.php b/register.php
index 46bb3783..bd90b1a2 100644
--- a/register.php
+++ b/register.php
@@ -114,7 +114,8 @@ switch ($_REQUEST['action']) {
 			$mmsg = "MAILOK";
 		}
 	        else {
-	                Error::add('email',_("Error Email address not confirmed<br />$validate_results[1]"));
+	                Error::add('email',_("Error Email address not confirmed") 
+			   . "<br />$validate_results[1]");
 	        }
 		/* End of mailcheck */
 	
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php
index e9c3d018..48ad4ce8 100644
--- a/templates/show_access_list.inc.php
+++ b/templates/show_access_list.inc.php
@@ -76,8 +76,8 @@
 	<td><?php echo $access->key; ?></td>
 	<td><?php echo $access->f_type; ?></td>
 	<td>
-		<a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('edit'); ?></a>
-		<a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=delete_record&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('delete'); ?></a>
+		<a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('edit', _('Edit')); ?></a>
+		<a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=delete_record&amp;access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a>
 	</td>
 </tr>
 	<?php  } // end foreach ?>
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 82b04fed..57b2c0b0 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -57,23 +57,23 @@ $title		= scrub_out($album->name) . '&nbsp;(' . $album->year . ')' . $disk .'&nb
 	</li>
 	<?php if (Access::check('interface','75')) { ?>
 	<li>
-		<a href="<?php echo $web_path; ?>/albums.php?action=clear_art&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('delete'); ?></a>
+		<a href="<?php echo $web_path; ?>/albums.php?action=clear_art&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('delete',_('Reset Album Art')); ?></a>
 		<?php echo _('Reset Album Art'); ?>
 	</li>
 	<?php } ?>
 	<li>
-		<a href="<?php echo $web_path; ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('view'); ?></a>
+		<a href="<?php echo $web_path; ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('view',_('Find Album Art')); ?></a>
 		<?php echo _('Find Album Art'); ?>
 	</li>
 	<?php  if ((Access::check('interface','50'))) { ?>
 	<li>
-		<a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('cog'); ?></a>
+		<a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&amp;album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('cog', _('Update from tags')); ?></a>
 		<?php echo _('Update from tags'); ?>
 	</li>
 	<?php  } ?>
 	<?php if (Access::check_function('batch_download')) { ?>
 	<li>
-		<a href="<?php echo $web_path; ?>/batch.php?action=album&amp;id=<?php echo $album->id; ?>"><?php echo get_user_icon('batch_download'); ?></a>
+		<a href="<?php echo $web_path; ?>/batch.php?action=album&amp;id=<?php echo $album->id; ?>"><?php echo get_user_icon('batch_download', _('Download')); ?></a>
 		<?php echo _('Download'); ?>
 	</li>
 	<?php } ?>
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index 2f29d11a..b2298d8f 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -32,7 +32,7 @@ if (Config::get('ratings')) {
 <div id="information_actions">
 <ul>
 <li>
-	<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('view'); ?></a><?php printf(_("Show All Songs By %s"), $artist->f_name); ?>
+	<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&amp;artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('view', _("Show All Songs By %s")); ?></a><?php printf(_("Show All Songs By %s"), $artist->f_name); ?>
 </li>
 <li>
 	<?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_' . $artist->id); ?><?php printf(_('Add All Songs By %s'), $artist->f_name); ?>
@@ -42,12 +42,12 @@ if (Config::get('ratings')) {
 </li>
 <?php if (Access::check('interface','50')) { ?>
 <li>
-	<a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog'); ?></a> <?php echo _('Update from tags'); ?>
+	<a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&amp;artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog', _('Update from tags')); ?></a> <?php echo _('Update from tags'); ?>
 </li>
 <?php } ?>
 <?php if (Access::check_function('batch_download')) { ?>
 <li>
-	<a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo get_user_icon('batch_download'); ?></a> 
+	<a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo get_user_icon('batch_download', _('Download')); ?></a> 
 	<?php echo _('Download'); ?>
 </li>
 <?php } ?>
diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php
index afe81f6e..c1614133 100644
--- a/templates/show_debug.inc.php
+++ b/templates/show_debug.inc.php
@@ -24,11 +24,11 @@
 <div id="information_actions">
 <ul>
 <li>
-	<a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo get_user_icon('cog'); ?></a>
+	<a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo get_user_icon('cog', _('Generate Configuration')); ?></a>
 	<?php echo _('Generate Configuration'); ?>
 </li>
 <li>
-	<a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo get_user_icon('server_lightning'); ?></a>
+	<a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo get_user_icon('server_lightning', _('Set Database Charset')); ?></a>
 	<?php echo _('Set Database Charset'); ?>
 </li>
 </ul>
diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php
index eef1a4f9..b5fb3405 100644
--- a/templates/show_democratic.inc.php
+++ b/templates/show_democratic.inc.php
@@ -30,7 +30,7 @@ show_box_top($string);
 <?php } ?>
 <?php if (Access::check('interface','75')) { ?>
 <li>
-	<a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo get_user_icon('server_lightning'); ?></a>
+	<a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo get_user_icon('server_lightning',_('Configure Democratic Playlist')); ?></a>
 	<?php echo _('Configure Democratic Playlist'); ?>
 </li>
 <?php if ($democratic->is_enabled()) { ?>
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index 512d1bb6..10b0fb9d 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -46,10 +46,10 @@ foreach ($object_ids as $genre_id) {
 	<tr class="<?php echo flip_class(); ?>">
 		<td class="cel_add">
 		<span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=genre&amp;id=<?php echo $genre->id; ?>');return true;" >
-				<?php echo get_user_icon('add'); ?>
+				<?php echo get_user_icon('add', _('Add')); ?>
 		</span>
 		<span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=genre_random&amp;id=<?php echo $genre->id; ?>');return true;" >
-				<?php echo get_user_icon('random'); ?>
+				<?php echo get_user_icon('random', _('Random')); ?>
 		</span>
 		</td>
 		<td class="cel_genre"><?php echo $genre->f_link; ?></td>
@@ -57,7 +57,7 @@ foreach ($object_ids as $genre_id) {
 		<td class="cel_action">
 			<?php if (Access::check_function('batch_download')) { ?>
 			<a href="<?php echo $genre->download_link; ?>">
-				<?php echo get_user_icon('batch_download'); ?>
+				<?php echo get_user_icon('batch_download', _('Batch Download')); ?>
 			</a>
 			<?php } ?>
 		</td>
diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php
index f511f27e..794d23f9 100644
--- a/templates/show_live_stream.inc.php
+++ b/templates/show_live_stream.inc.php
@@ -23,7 +23,7 @@
 <div id="information_actions">
 <ul>
 <li>
-	<a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo get_user_icon('add'); ?></a> <?php echo _('Add Radio Station'); ?>
+	<a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo get_user_icon('add',_('Add')); ?></a> <?php echo _('Add Radio Station'); ?>
 </li>
 <li>
 	<a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=show_import_playlist"><?php echo get_user_icon('world_link',_('Import')); ?></a> <?php echo _('Import'); ?>
diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php
index 8abab549..0d8bae95 100644
--- a/templates/show_manage_democratic.inc.php
+++ b/templates/show_manage_democratic.inc.php
@@ -55,7 +55,7 @@ show_box_top(_('Manage Democratic Playlists'));  ?>
 	<td><?php echo $democratic->count_items(); ?></td>
 	<td>
 	<?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all',_('Play'),'play_democratic'); ?>
-	<a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&amp;democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo get_user_icon('delete'); ?></a>
+	<a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&amp;democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a>
 	</td>
 </tr>
 <?php } if (!count($playlists)) { ?>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index eff58442..b7b4879a 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -27,12 +27,12 @@
 <div id="information_actions">
 <ul>
 	<li>
-		<a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('statistics'); ?></a>
+		<a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&amp;playlist_id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('statistics',_('Normalize Tracks')); ?></a>
 		<?php echo _('Normalize Tracks'); ?>
 	</li>
         <?php if (Access::check_function('batch_download')) { ?>
 	<li>
-		<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&amp;id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download'); ?></a>
+		<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&amp;id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download', _('Batch Download')); ?></a>
 		<?php echo _('Batch Download'); ?>
 	</li>
         <?php } ?>
diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php
index d2e4919c..01be5a8f 100644
--- a/templates/show_search_options.inc.php
+++ b/templates/show_search_options.inc.php
@@ -29,7 +29,7 @@
 </li>
 	<?php if (Access::check_function('batch_download')) { ?>
 <li>
-	<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse"><?php echo get_user_icon('batch_download'); ?></a>
+	<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse"><?php echo get_user_icon('batch_download', _('Batch Download')); ?></a>
 	<?php echo _('Batch Download'); ?>
 </li>
 	<?php } ?>
diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php
index fbc88c95..f63ead4d 100644
--- a/templates/show_shout_row.inc.php
+++ b/templates/show_shout_row.inc.php
@@ -29,11 +29,11 @@
 	<td class="cel_action">
 
                 <a href="<?php echo $web_path; ?>/admin/shout.php?action=show_edit&amp;shout_id=<?php echo $shout->id; ?>">
-                <?php echo get_user_icon('edit'); ?>
+                <?php echo get_user_icon('edit', _('Edit')); ?>
                 </a>
 
                 <a href="<?php echo $web_path; ?>/admin/shout.php?action=delete&amp;shout_id=<?php echo $shout->id; ?>">
-                <?php echo get_user_icon('delete'); ?>
+                <?php echo get_user_icon('delete', _('Delete')); ?>
                 </a>
 	</td>
 </tr>
diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php
index 000e1581..a809dd0e 100644
--- a/templates/show_song.inc.php
+++ b/templates/show_song.inc.php
@@ -28,8 +28,8 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
 	<dd class"<?php echo $rowparity; ?>">
 		<?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_song_' . $song->id); ?>
 		<?php if (Access::check_function('download')) { ?>
-			<a href="<?php echo Song::play_url($song->id); ?>"><?php echo get_user_icon('link'); ?></a>
-			<a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&amp;song_id=<?php echo $song->id; ?>"><?php echo get_user_icon('download'); ?></a>
+			<a href="<?php echo Song::play_url($song->id); ?>"><?php echo get_user_icon('link',_('Link')); ?></a>
+			<a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&amp;song_id=<?php echo $song->id; ?>"><?php echo get_user_icon('download',_('Download')); ?></a>
 		<?php } ?>
 		<?php if (Access::check('interface','75')) { ?>
 			<span id="<?php echo($button_flip_state_id); ?>">
@@ -38,23 +38,23 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
 		<?php } ?>
 	</dd>
 <?php 
-  $songprops['Title']   = scrub_out($song->title);
-  $songprops['Artist']  = $song->f_artist_link;
-  $songprops['Album']   = $song->f_album_link . " (" . scrub_out($song->year). ")";
-  $songprops['Genre']   = $song->f_genre_link;
-  $songprops['Length']  = scrub_out($song->f_time); 
-  $songprops['Comment'] = scrub_out($song->comment);
-  $songprops['Label']   = scrub_out($song->label);
-  $songprops['Language']= scrub_out($song->language); 
-  $songprops['Catalog Number']   = scrub_out($song->catalog_number);
-  $songprops['Bitrate']   = scrub_out($song->f_bitrate);
+  $songprops[gettext_noop('Title')]   = scrub_out($song->title);
+  $songprops[gettext_noop('Artist')]  = $song->f_artist_link;
+  $songprops[gettext_noop('Album')]   = $song->f_album_link . " (" . scrub_out($song->year). ")";
+  $songprops[gettext_noop('Genre')]   = $song->f_genre_link;
+  $songprops[gettext_noop('Length')]  = scrub_out($song->f_time); 
+  $songprops[gettext_noop('Comment')] = scrub_out($song->comment);
+  $songprops[gettext_noop('Label')]   = scrub_out($song->label);
+  $songprops[gettext_noop('Song Language')]= scrub_out($song->language); 
+  $songprops[gettext_noop('Catalog Number')]   = scrub_out($song->catalog_number);
+  $songprops[gettext_noop('Bitrate')]   = scrub_out($song->f_bitrate);
   if (Access::check('interface','75')) {
-    $songprops['Filename']   = scrub_out($song->file) . " " . $song->f_size . "MB";
+    $songprops[gettext_noop('Filename')]   = scrub_out($song->file) . " " . $song->f_size . "MB";
   }
   if ($song->update_time) {
-    $songprops['Last Updated']   = date("d/m/Y H:i",$song->update_time);
+    $songprops[gettext_noop('Last Updated')]   = date("d/m/Y H:i",$song->update_time);
   }
-  $songprops['Added']   = date("d/m/Y H:i",$song->addition_time);
+  $songprops[gettext_noop('Added')]   = date("d/m/Y H:i",$song->addition_time);
 
   foreach ($songprops as $key => $value)
   {
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index f162c6c6..03f6ee3c 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -115,7 +115,7 @@ if (Config::get('user_agreement')) { ?>
 </tr>
 <tr>
 	<td align='center' height='20'>
-		<span style="color:red;">* Required fields</span>
+		<span style="color:red;"><?php echo _('* Required fields'); ?></span>
 	</td>
 	<td>&nbsp;</td>
 </tr>
diff --git a/templates/show_user_row.inc.php b/templates/show_user_row.inc.php
index feb5895b..42580e63 100644
--- a/templates/show_user_row.inc.php
+++ b/templates/show_user_row.inc.php
@@ -35,18 +35,18 @@
 		</td>
 	<?php } ?>
 	<td class="cel_action">
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('edit'); ?></a>
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('preferences'); ?></a>
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('edit', _('Edit')); ?></a>
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('preferences', _('Preferences')); ?></a>
 	<?php
 	//FIXME: Fix this for the extra permission levels
 	if ($client->disabled == '1') { 
-		echo "<a href=\"".$web_path."/admin/users.php?action=enable&amp;user_id=$client->id\">" . get_user_icon('enable') . "</a>";
+		echo "<a href=\"".$web_path."/admin/users.php?action=enable&amp;user_id=$client->id\">" . get_user_icon('enable', _('Enable')) . "</a>";
 	}
 	else {
-		echo "<a href=\"".$web_path."/admin/users.php?action=disable&amp;user_id=$client->id\">" . get_user_icon('disable') ."</a>";
+		echo "<a href=\"".$web_path."/admin/users.php?action=disable&amp;user_id=$client->id\">" . get_user_icon('disable', _('Disable')) ."</a>";
 	}
 	?>
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=delete&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('delete'); ?></a>
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=delete&amp;user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a>
 	</td>
        <?php
 	if (($client->is_logged_in()) AND ($client->is_online())) {
diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php
index f07bb5e7..7b9d8e3e 100644
--- a/templates/show_user_stats.inc.php
+++ b/templates/show_user_stats.inc.php
@@ -27,7 +27,7 @@
 	if (count($favorite_artists)) { 
 		$items = $working_user->format_favorites($favorite_artists); 
 		$title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&amp;type=artist">' . 
-			get_user_icon('all') . '</a>&nbsp;' .  _('Favorite Artists');
+			get_user_icon('all', _('Favorite Artists')) . '</a>&nbsp;' .  _('Favorite Artists');
 		show_info_box($title,'artist',$items); 
 	}
 	else { 
@@ -40,7 +40,7 @@
 	if (count($favorite_albums)) { 
 		$items = $working_user->format_favorites($favorite_albums);
                 $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&amp;type=album">' . 
-                        get_user_icon('all') . '</a>&nbsp;' .  _('Favorite Albums');
+                        get_user_icon('all', _('Favorite Albums')) . '</a>&nbsp;' .  _('Favorite Albums');
 		show_info_box($title,'album',$items);
 	}
 	else { 
@@ -53,7 +53,7 @@
 	if (count($favorite_songs)) { 
 		$items = $working_user->format_favorites($favorite_songs); 
                 $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&amp;type=song">' . 
-                        get_user_icon('all') . '</a>&nbsp;' .  _('Favorite Songs');
+                        get_user_icon('all', _('Favorite Songs')) . '</a>&nbsp;' .  _('Favorite Songs');
 		show_info_box($title,'your_song',$items); 
 	}
 	else { 
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index b0ffa145..a3b7891d 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -29,13 +29,13 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
 	${$text} = ' selected="selected"';
   ?>
     <ul class="sb3" id="sb_browse_bb">
-      <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></li>
+      <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Titles'); ?></a></li>
       <li id="sb_browse_bb_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li>
-      <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></li>
+      <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artists'); ?></a></li>
   <!--    <li id="sb_browse_bb_Tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo _('Tag Cloud'); ?></a></li> -->
-      <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlist'); ?></a></li>
+      <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlists'); ?></a></li>
       <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li>
-      <li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=video"><?php echo _('Video'); ?></a></li>
+      <li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=video"><?php echo _('Videos'); ?></a></li>
     </ul>
   </li>
 <?php if (count($allowed_filters)) { ?>