Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2013-01-08 17:32:39 -05:00 · 2013-01-08 17:32:39 -05:00 · 6e7f45e615
commit 6e7f45e615
parent 1263c04621 8b8e12a234
5 changed files with 4 additions and 4 deletions
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@ -1,6 +1,6 @@
 <div id="content" class="jp-container">
 <h1><? echo _("Live stream") ?></h1>
-<a id="popup-link" href="#">Share</a> 
+<a id="popup-link" href="#"><?php echo _("Share") ?></a> 
 <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
 <script>
 function setjPlayer(url, type, serverType){