From 925afcc64cf995cbba19aad67ca48e4da5623803 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Tue, 13 Nov 2012 15:10:07 -0500
Subject: [PATCH 01/11] renamed links

---
 .../scripts/airtime-recorder/index.phtml      |  2 +-
 .../scripts/audiopreview/audio-preview.phtml  | 20 +++++++++----------
 .../views/scripts/dashboard/about.phtml       |  6 +++---
 .../views/scripts/dashboard/help.phtml        |  2 +-
 .../views/scripts/dashboard/index.phtml       |  2 +-
 .../scripts/dashboard/stream-player.phtml     |  6 +++---
 .../views/scripts/error/denied.phtml          |  2 +-
 .../views/scripts/error/error.phtml           |  4 ++--
 .../form/add-show-rebroadcast-absolute.phtml  |  4 ++--
 .../scripts/form/add-show-rebroadcast.phtml   |  4 ++--
 .../views/scripts/form/login.phtml            |  4 ++--
 .../views/scripts/form/preferences.phtml      |  2 +-
 .../scripts/form/preferences_livestream.phtml | 10 +++++-----
 .../views/scripts/form/register-dialog.phtml  |  4 ++--
 .../views/scripts/form/showbuilder.phtml      |  2 +-
 .../scripts/form/smart-block-criteria.phtml   |  2 +-
 .../views/scripts/form/support-setting.phtml  |  4 ++--
 .../views/scripts/index/display.phtml         |  2 +-
 .../views/scripts/index/main.phtml            |  2 +-
 .../views/scripts/index/newfield.phtml        |  2 +-
 .../views/scripts/library/edit-file-md.phtml  |  2 +-
 .../library/get-file-metadata.ajax.phtml      | 10 +++++-----
 .../views/scripts/library/library.phtml       |  2 +-
 .../views/scripts/login/index.phtml           |  2 +-
 .../views/scripts/login/logout.phtml          |  2 +-
 .../views/scripts/login/password-change.phtml |  4 ++--
 .../login/password-restore-after.phtml        |  6 +++---
 .../scripts/login/password-restore.phtml      |  2 +-
 .../views/scripts/partialviews/header.phtml   | 12 +++++------
 .../views/scripts/partialviews/trialBox.phtml |  8 ++++----
 .../views/scripts/playlist/playlist.phtml     | 16 +++++++--------
 .../views/scripts/playlist/smart-block.phtml  | 16 +++++++--------
 .../views/scripts/plupload/upload.phtml       |  2 +-
 .../scripts/preference/directory-config.phtml |  2 +-
 .../views/scripts/preference/index.phtml      |  6 +++---
 .../scripts/preference/stream-setting.phtml   | 10 +++++-----
 .../scripts/recorder/get-show-schedule.phtml  |  2 +-
 .../views/scripts/recorder/index.phtml        |  2 +-
 .../scripts/schedule/add-show-form.phtml      | 12 +++++------
 .../views/scripts/schedule/add-show.phtml     |  2 +-
 .../schedule/cancel-current-show.phtml        |  2 +-
 .../views/scripts/schedule/cancel-show.phtml  |  2 +-
 .../views/scripts/schedule/clear-show.phtml   |  2 +-
 .../views/scripts/schedule/delete-show.phtml  |  2 +-
 .../views/scripts/schedule/event-feed.phtml   |  2 +-
 .../scripts/schedule/make-context-menu.phtml  |  2 +-
 .../views/scripts/schedule/move-show.phtml    |  2 +-
 .../views/scripts/schedule/remove-group.phtml |  2 +-
 .../views/scripts/schedule/resize-show.phtml  |  2 +-
 .../schedule/show-content-dialog.phtml        | 12 +++++------
 .../scripts/showbuilder/builderDialog.phtml   |  4 ++--
 .../views/scripts/systemstatus/index.phtml    | 14 ++++++-------
 .../views/scripts/user/add-user.phtml         |  6 +++---
 .../views/scripts/user/get-hosts.phtml        |  2 +-
 .../user/get-user-data-table-info.phtml       |  2 +-
 .../views/scripts/user/index.phtml            |  2 +-
 .../views/scripts/webstream/webstream.phtml   | 14 ++++++-------
 57 files changed, 140 insertions(+), 140 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
index 0a04fb79c..28044500a 100644
--- a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>AirtimeRecorder</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("AirtimeRecorder") ?></b> and script/action name <b>index</b></center>
diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index f76249b9f..789be01b3 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -19,19 +19,19 @@
         <div class="jp-gui jp-interface">
             <ul class="jp-controls">
                 <li class="ui-state-default ui-corner-all jp-previous">
-                    <span class="ui-icon ui-icon-seek-prev" tabindex="1">previous</span>
+                    <span class="ui-icon ui-icon-seek-prev" tabindex="1"><? echo _("previous") ?></span>
                 </li>
                 <li class="ui-state-default ui-corner-all jp-play">
-                    <span class="ui-icon ui-icon-play" tabindex="1">play</span>
+                    <span class="ui-icon ui-icon-play" tabindex="1"><? echo _("play") ?></span>
                 </li>
                 <li class="ui-state-default ui-corner-all jp-pause">
-                    <span class="ui-icon ui-icon-pause" tabindex="1">pause</span>
+                    <span class="ui-icon ui-icon-pause" tabindex="1"><? echo _("pause") ?></span>
                 </li>
                 <li class="ui-state-default ui-corner-all jp-next">
-                    <span class="ui-icon ui-icon-seek-next" tabindex="1">next</span>
+                    <span class="ui-icon ui-icon-seek-next" tabindex="1"><? echo _("next") ?></span>
                 </li>
                 <li class="ui-state-default ui-corner-all jp-stop">
-                    <span class="ui-icon ui-icon-stop" tabindex="1">stop</span>
+                    <span class="ui-icon ui-icon-stop" tabindex="1"><? echo _("stop") ?></span>
                 </li>
             </ul>
             <div class="jp-time-block">
@@ -47,16 +47,16 @@
             </div>
             <div class="jp-volume-block">
                 <div class="jp-mute">
-                    <span class="ui-icon" tabindex="1" title="mute">mute</span>
+                    <span class="ui-icon" tabindex="1" title="mute"><? echo _("mute") ?></span>
                 </div>
                 <div class="jp-unmute">
-                    <span class="ui-icon" tabindex="1" title="unmute">unmute</span>
+                    <span class="ui-icon" tabindex="1" title="unmute"><? echo _("unmute") ?></span>
                 </div>
                 <div class="jp-volume-bar">
                     <div class="jp-volume-bar-value"></div>
                 </div>
                 <div class="jp-volume-max">
-                    <span class="ui-icon" tabindex="1" title="max volume">max volume</span>
+                    <span class="ui-icon" tabindex="1" title="max volume"><? echo _("max volume") ?></span>
                 </div>
             </div>
         </div>
@@ -66,8 +66,8 @@
             </ul>
         </div>
         <div class="jp-no-solution">
-            <span>Update Required</span>
-            To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank">Flash plugin</a>.
+            <span><? echo _("Update Required") ?></span>
+            To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank"><? echo _("Flash plugin") ?></a>.
         </div>
     </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml
index b2ce0cb38..5a5ac1ace 100644
--- a/airtime_mvc/application/views/scripts/dashboard/about.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml
@@ -1,8 +1,8 @@
 <div class="text-content">
-    <h2>About</h2>
+    <h2><? echo _("About") ?></h2>
 <p>
-<a href="http://airtime.sourcefabric.org" target="_blank">Airtime</a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
-© 2012 <a href="http://www.sourcefabric.org" target="_blank">Sourcefabric</a> o.p.s. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
+<a href="http://airtime.sourcefabric.org" target="_blank"><? echo _("Airtime") ?></a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
+© 2012 <a href="http://www.sourcefabric.org" target="_blank"><? echo _("Sourcefabric") ?></a> o.p.s. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
 </p>
 </div>
 <br>
diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml
index 3e5d68553..425d04568 100644
--- a/airtime_mvc/application/views/scripts/dashboard/help.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml
@@ -10,6 +10,6 @@
     <li>Select your media from the left pane and drag them to your show in the right pane.</li>
 </ol>
 <p><strong>Then you're good to go!</strong><br />
-For more detailed help, read the <a href="http://www.sourcefabric.org/en/airtime/manuals/" target="_blank">user manual</a>.</p>
+For more detailed help, read the <a href="http://www.sourcefabric.org/en/airtime/manuals/" target="_blank"><? echo _("user manual") ?></a>.</p>
 </div>
 
diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml
index e5b885fc7..abb67f7f4 100644
--- a/airtime_mvc/application/views/scripts/dashboard/index.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Dashboard</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Dashboard") ?></b> and script/action name <b>index</b></center>
diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index ce4faa068..dbf5d052e 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -1,5 +1,5 @@
 <div id="content" class="jp-container">
-<h1>Live stream</h1> 
+<h1><? echo _("Live stream") ?></h1> 
 <?php $ids = Application_Model_StreamSetting::getEnabledStreamIds(); ?>
 <script>
 function setjPlayer(url, type, serverType){
@@ -73,8 +73,8 @@ $(document).ready(function(){
     <div class="jp-type-single">
         <div id="jp_interface_1" class="jp-gui jp-interface">
             <ul class="jp-controls">
-                <li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;">mute</a></li>
-                <li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;">unmute</a></li>
+                <li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;"><? echo _("mute") ?></a></li>
+                <li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;"><? echo _("unmute") ?></a></li>
             </ul>
             <div class="jp-volume-bar">
                 <div class="jp-volume-bar-value"></div>
diff --git a/airtime_mvc/application/views/scripts/error/denied.phtml b/airtime_mvc/application/views/scripts/error/denied.phtml
index 5a133fec6..23baf0661 100644
--- a/airtime_mvc/application/views/scripts/error/denied.phtml
+++ b/airtime_mvc/application/views/scripts/error/denied.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Error</b> and script/action name <b>denied</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Error") ?></b> and script/action name <b>denied</b></center>
diff --git a/airtime_mvc/application/views/scripts/error/error.phtml b/airtime_mvc/application/views/scripts/error/error.phtml
index f3c889b1c..a58862e11 100644
--- a/airtime_mvc/application/views/scripts/error/error.phtml
+++ b/airtime_mvc/application/views/scripts/error/error.phtml
@@ -3,14 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Zend Framework Default Application</title>
+  <title><? echo _("Zend Framework Default Application") ?></title>
 </head>
 <body>
     <div class="error-content">
         <h2>Page not found!</h2>
         <p>Looks like the page you were looking for doesn't exist!</p>
         <div class="button-bar">
-            <a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>">Help</a>
+            <a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><? echo _("Help") ?></a>
         </div>
     </div>
 </body>
diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
index af562738a..0e1dd34a1 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
@@ -15,7 +15,7 @@
                 <?php if($i > 1): ?>
                     <a class="ui-button ui-button-icon-only  ui-widget ui-state-default" id="remove_rebroadcast_absolute_<?php echo $i ?>">
                         <span class="ui-icon ui-icon-closethick"></span>
-                        <span class="ui-button-text">Remove</span>
+                        <span class="ui-button-text"><? echo _("Remove") ?></span>
                     </a>
                 <?php endif; ?>
                 <?php if(($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors()) 
@@ -37,7 +37,7 @@
     </ul>
     <a class="ui-button ui-button-icon-only  ui-widget ui-state-default add_absolute_rebroadcast_day">
         <span class="ui-icon ui-icon-plusthick"></span>
-        <span class="ui-button-text">Add</span>
+        <span class="ui-button-text"><? echo _("Add") ?></span>
     </a>
     </dd>          
     </dl>
diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
index 41a4fce79..960074d3d 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
@@ -15,7 +15,7 @@
                     <?php if($i > 1): ?>
                         <a class="ui-button ui-button-icon-only  ui-widget ui-state-default" id="remove_rebroadcast_<?php echo $i ?>">
                             <span class="ui-icon ui-icon-closethick"></span>
-                            <span class="ui-button-text">Remove</span>
+                            <span class="ui-button-text"><? echo _("Remove") ?></span>
                         </a>
                     <?php endif; ?>
                     <?php if(($this->element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors()) 
@@ -38,7 +38,7 @@
             </ul>
         <a class="ui-button ui-button-icon-only  ui-widget ui-state-default add_absolute_rebroadcast_day">
             <span class="ui-icon ui-icon-plusthick"></span>
-            <span class="ui-button-text">Add</span>
+            <span class="ui-button-text"><? echo _("Add") ?></span>
         </a>
         </dd>
     </dl>
diff --git a/airtime_mvc/application/views/scripts/form/login.phtml b/airtime_mvc/application/views/scripts/form/login.phtml
index 87510201a..ab8431f0d 100644
--- a/airtime_mvc/application/views/scripts/form/login.phtml
+++ b/airtime_mvc/application/views/scripts/form/login.phtml
@@ -22,7 +22,7 @@
     <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
         <dt id="reset-label" class="hidden">&nbsp;</dt>
         <dd id="reset-element" class="text-right">
-          <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset">Reset password</a>
+          <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><? echo _("Reset password") ?></a>
         </dd>
     <?php endif; ?>
     <?php echo $this->element->getElement('captcha') ?>
@@ -32,4 +32,4 @@
     </dd>
     
   </dl>
-</form>
\ No newline at end of file
+</form>
diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml
index cac7af2b2..6cfea7722 100644
--- a/airtime_mvc/application/views/scripts/form/preferences.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences.phtml
@@ -7,7 +7,7 @@
         <?php echo $this->element->getSubform('preferences_email_server') ?>
     </div>
 
-    <h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span>SoundCloud Settings</h3>
+    <h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><? echo _("SoundCloud Settings") ?></h3>
 
     <div class="collapsible-content" id="soundcloud-settings">
         <?php echo $this->element->getSubform('preferences_soundcloud') ?>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 62339e137..807221e10 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -1,5 +1,5 @@
 <fieldset class="padded stream-setting-global" style="margin-top: 15px">
-    <legend>Input Stream Settings</legend>
+    <legend><? echo _("Input Stream Settings") ?></legend>
     <dl class="zend_form">
         <dt id="auto_transition-label">
             <label class="optional" for="auto_transition"><?php echo $this->element->getElement('auto_transition')->getLabel() ?> :
@@ -111,12 +111,12 @@
         <dd id="master_dj_connection_url-element">
             <span id="stream_url"><?php echo $this->element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?></span>
             <?php if(!$this->isDemo){?>
-                <a href=# id="connection_url_override" style="font-size: 12px;">Override</a>&nbsp;&nbsp;
+                <a href=# id="connection_url_override" style="font-size: 12px;"><? echo _("Override") ?></a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
             <?php } ?>
             <div id="master_dj_connection_url_actions" style="display:none">
-                <a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
+                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
             </div>
         </dd>
             <dt id="dj_harbor_input_port-label">
@@ -154,12 +154,12 @@
         <dd id="live_dj_connection_url-element">
             <span id="stream_url"><?php echo $this->element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?></span>
             <?php if( !$this->isDemo ){?>   
-                <a href=# id="connection_url_override" style="font-size: 12px;">Override</a>&nbsp;&nbsp;
+                <a href=# id="connection_url_override" style="font-size: 12px;"><? echo _("Override") ?></a>&nbsp;&nbsp;
                 <span class="override_help_icon">
                 </span><br>
             <?php } ?>
             <div id="live_dj_connection_url_actions" style="display:none">
-                <a href=# id="ok" style="font-size: 12px;">OK</a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
+                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
             </div>
         </dd>
     </dl>
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index b4c9630bb..cddd440a9 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -161,7 +161,7 @@
         
             <div id="show_what_sending" style="display: block;">
                 <fieldset class="display_field toggle closed">
-                <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
+                <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Show me what I am sending ") ?></legend>
                     <dl>
                         <?php echo $this->element->getElement('SendInfo') ?>
                     </dl>
@@ -175,7 +175,7 @@
                         <?php echo $this->element->getElement('Privacy')->getLabel() ?>
                     </label>
                 <?php }else{?>
-                    <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Terms and Conditions</a>
+                    <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><? echo _("Terms and Conditions") ?></a>
                 <?php }?>
             </div>
     </form>
diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index a0193b664..49d482d69 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -4,7 +4,7 @@
 <?php echo $this->element->getElement('sb_time_end'); ?>
 
 <a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range">
-    <i class="icon-white icon-search"></i> Find Shows</a>
+    <i class="icon-white icon-search"></i><? echo _(" Find Shows") ?></a>
 <div class="sb-advanced-options">
     <fieldset class="padded display_field push-down-8 closed">
         <legend style="cursor: pointer;">
diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 1e95b6e04..962a9c491 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -1,6 +1,6 @@
 <form id="smart-block-form" method="post" action="">
 <fieldset class='toggle <?php echo $this->openOption ? "" : "closed"?> sb-criteria-fieldset' id='smart_block_options'>
-<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span>Smart Block Options</legend>
+<legend style='cursor: pointer;'><span class='ui-icon ui-icon-triangle-2-n-s'></span><? echo _("Smart Block Options") ?></legend>
 
     <dl class='zend_form search-criteria'>
         <div class='btn-toolbar clearfix'>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index ad15671f6..e056f03bf 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -154,7 +154,7 @@
     </dl>
     <div id="show_what_sending" style="display: block;">
         <fieldset class="display_field toggle closed">
-        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Show me what I am sending </legend>
+        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Show me what I am sending ") ?></legend>
             <dl>
                 <?php echo $this->element->getElement('SendInfo') ?>
             </dl>
@@ -176,7 +176,7 @@
                 </ul>
             <?php endif; ?>
         <?php }else{?>
-            <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;">Sourcefabric Privacy Policy</a>
+            <a id="link_to_terms_and_condition" href="http://www.sourcefabric.org/en/about/policy/" onclick="window.open(this.href); return false;"><? echo _("Sourcefabric Privacy Policy") ?></a>
         <?php }?>
     </div>
 </fieldset>
diff --git a/airtime_mvc/application/views/scripts/index/display.phtml b/airtime_mvc/application/views/scripts/index/display.phtml
index d2cfe08b7..95651f8a9 100644
--- a/airtime_mvc/application/views/scripts/index/display.phtml
+++ b/airtime_mvc/application/views/scripts/index/display.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Index</b> and script/action name <b>display</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>display</b></center>
diff --git a/airtime_mvc/application/views/scripts/index/main.phtml b/airtime_mvc/application/views/scripts/index/main.phtml
index 6d10563ec..e90f29c6f 100644
--- a/airtime_mvc/application/views/scripts/index/main.phtml
+++ b/airtime_mvc/application/views/scripts/index/main.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Index</b> and script/action name <b>main</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>main</b></center>
diff --git a/airtime_mvc/application/views/scripts/index/newfield.phtml b/airtime_mvc/application/views/scripts/index/newfield.phtml
index d1935f51f..4c5d95a86 100644
--- a/airtime_mvc/application/views/scripts/index/newfield.phtml
+++ b/airtime_mvc/application/views/scripts/index/newfield.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Index</b> and script/action name <b>newfield</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>newfield</b></center>
diff --git a/airtime_mvc/application/views/scripts/library/edit-file-md.phtml b/airtime_mvc/application/views/scripts/library/edit-file-md.phtml
index bdead9832..3c1d28675 100644
--- a/airtime_mvc/application/views/scripts/library/edit-file-md.phtml
+++ b/airtime_mvc/application/views/scripts/library/edit-file-md.phtml
@@ -1,5 +1,5 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong">
-    <h2>Edit Metadata</h2>
+    <h2><? echo _("Edit Metadata") ?></h2>
 
     <?php //$this->form->setAction($this->url());
         echo $this->form; ?>
diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index ad65f2417..53adc86e0 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -36,10 +36,10 @@
 
 <?php if ($this->type == "playlist") { ?>
 <div class='file-md-qtip-legend'>
-<span class='webstream'>o</span> <span>Web Stream</span><br />
-<span class='dynamic'>o</span> <span>Dynamic Smart Block</span><br />
-<span class='static'>o</span> <span>Static Smart Block</span><br />
-<span>o</span> <span>Audio Track</span>
+<span class='webstream'><? echo _("o") ?></span> <span>Web Stream</span><br />
+<span class='dynamic'><? echo _("o") ?></span> <span>Dynamic Smart Block</span><br />
+<span class='static'><? echo _("o") ?></span> <span>Static Smart Block</span><br />
+<span><? echo _("o") ?></span> <span>Audio Track</span>
 </div>
 <?php } ?>
 
@@ -115,7 +115,7 @@
             <?php endforeach; ?>
         <?php endforeach; ?>
             <tr>
-                <td>Limit to </td>
+                <td><? echo _("Limit to ") ?></td>
                 <td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
             </tr>
         </table>
diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
index 03c4ad259..7a3ca0503 100644
--- a/airtime_mvc/application/views/scripts/library/library.phtml
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -1,7 +1,7 @@
 <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
 <div id="import_status" class="library_import" style="display:none">File import in progress...<img src=<?php $baseUrl . "/css/images/file_import_loader.gif"?>></img></div>
 <fieldset class="toggle closed" id="filter_options">
-    <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
+    <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Advanced Search Options") ?></legend>
     <div id="advanced_search" class="advanced_search form-horizontal"></div>
 </fieldset>
 <table id="library_display" cellpadding="0" cellspacing="0" class="datatable">
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml
index 7aba40c29..dbd598058 100644
--- a/airtime_mvc/application/views/scripts/login/index.phtml
+++ b/airtime_mvc/application/views/scripts/login/index.phtml
@@ -1,6 +1,6 @@
 <div class="login_box">
     <div class="logobox">&nbsp;</div>
-        <h2>Login</h2>
+        <h2><? echo _("Login") ?></h2>
     <div id="login" class="login-content clearfix">
         <?php if(isset($this->demo) && $this->demo == 1){?>
             <p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
diff --git a/airtime_mvc/application/views/scripts/login/logout.phtml b/airtime_mvc/application/views/scripts/login/logout.phtml
index 35e6f2b8a..e3a1a389c 100644
--- a/airtime_mvc/application/views/scripts/login/logout.phtml
+++ b/airtime_mvc/application/views/scripts/login/logout.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Login</b> and script/action name <b>logout</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Login") ?></b> and script/action name <b>logout</b></center>
diff --git a/airtime_mvc/application/views/scripts/login/password-change.phtml b/airtime_mvc/application/views/scripts/login/password-change.phtml
index 8be481cea..84ebac12a 100644
--- a/airtime_mvc/application/views/scripts/login/password-change.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-change.phtml
@@ -1,9 +1,9 @@
 <div class="login_box">
   <div class="logobox">&nbsp;</div>
-  <h2>New password</h2>
+  <h2><? echo _("New password") ?></h2>
   
   <div id="login" class="login-content clearfix">
   <p class="light">Please enter and confirm your new password in the fields below.</p>
     <?php echo $this->form; ?>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
index d5da4327e..19ebd6daf 100644
--- a/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-restore-after.phtml
@@ -1,9 +1,9 @@
 <div class="login_box">
   <div class="logobox">&nbsp;</div>
-  <h2>Email sent</h2>
+  <h2><? echo _("Email sent") ?></h2>
   
   <div id="login" class="login-content clearfix">
-    <p class="light">An email has been sent</p>
-    <p><a class="link" href="<?php echo $this->baseUrl('login'); ?>">Back to login screen</a></p>
+    <p class="light"><? echo _("An email has been sent") ?></p>
+    <p><a class="link" href="<?php echo $this->baseUrl('login'); ?>"><? echo _("Back to login screen") ?></a></p>
   </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/login/password-restore.phtml b/airtime_mvc/application/views/scripts/login/password-restore.phtml
index bf65b2114..53385c636 100644
--- a/airtime_mvc/application/views/scripts/login/password-restore.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-restore.phtml
@@ -1,6 +1,6 @@
 <div class="login_box">
   <div class="logobox">&nbsp;</div>
-  <h2>Reset password</h2>
+  <h2><? echo _("Reset password") ?></h2>
   
   <div id="login" class="login-content clearfix">
     <p class="light">Please enter your account e-mail address. You will receive a link to create a new password via e-mail.</p>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index b325e3fb6..3d32c4f4e 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -3,7 +3,7 @@
     <div class="text-row"><strong>Previous:</strong> <span id='previous'></span> <span id='prev-length'></span></div>
     <div class="now-playing-info song">
       <div class="time-flow"><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
-      <span id='current'></span> <span class="length" id="song-length"></span> </div>
+      <span id='current'></span> <span class="length" id="song-length"></span><? echo _(" ") ?></div>
     <div class="progressbar">
       <div class="progress-song" id="progress-bar" style="width:0%;"></div>
     </div>
@@ -21,7 +21,7 @@
       </div>
     </div>
   <div class="source-info-block">
- 	<h3>Source Streams</h3>
+ 	<h3><? echo _("Source Streams") ?></h3>
     <ul>
       <li>
         <div id="master_dj_div" class="source-label">
@@ -42,7 +42,7 @@
         <div class="line-to-on-air"></div>
       </li>
       <li>
-        <div id="scheduled_play_div" class="source-label"> Scheduled Play</div>
+        <div id="scheduled_play_div" class="source-label"><? echo _(" Scheduled Play") ?></div>
         <div class="line-to-switch"></div>
         <a href="#" id="scheduled_play" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->scheduled_play_switch?></span></a>
         <div class="line-to-on-air"></div>
@@ -51,12 +51,12 @@
   </div>
   <div class="on-air-block">
   <h3>&nbsp;</h3>
-    <div class="on-air-info off" id="on-air-info">ON AIR</div>
-    <a href="#" class="listen-control-button"><span>Listen</span></a>
+    <div class="on-air-info off" id="on-air-info"><? echo _("ON AIR") ?></div>
+    <a href="#" class="listen-control-button"><span><? echo _("Listen") ?></span></a>
   </div>
   <div class="time-info-block pull-right">
     <ul>
-      <li>Station time</li>
+      <li><? echo _("Station time") ?></li>
       <li class="time" id="time"></li>
       <li class="time-zone"><span id="time-zone"></span></li>
     </ul>
diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
index 7fb28258a..38c50ba56 100644
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
@@ -1,12 +1,12 @@
 <?php if($this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
   <div class="trial-box">
-      <p>Your trial expires in</p>
+      <p><? echo _("Your trial expires in") ?></p>
       <div class="trial-box-calendar">
            <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
-           <div class="trial-box-calendar-gray">days</div>
+           <div class="trial-box-calendar-gray"><? echo _("days") ?></div>
       </div>
       <div class="trial-box-button">
-            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank">My Account</a>
+            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank"><? echo _("My Account") ?></a>
       </div>
   </div>
-<?php }?> 
\ No newline at end of file
+<?php }?> 
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index 6f962b97b..42b3124e2 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -10,21 +10,21 @@ if (isset($this->obj)) {
             New <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
-            <li id='lib-new-pl'><a href="#">New Playlist</a></li>
-            <li id='lib-new-bl'><a href="#">New Smart Block</a></li>
-            <li id='lib-new-ws'><a href="#">New Webstream</a></li>
+            <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>
+            <li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li>
+            <li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li>
         </ul>
     </div>
 <?php if (isset($this->obj)) : ?>
     <div class='btn-group pull-right'>
-        <button class="btn btn-inverse" title='Save playlist' type="button" id="save_button">Save</button>
+        <button class="btn btn-inverse" title='Save playlist' type="button" id="save_button"><? echo _("Save") ?></button>
     </div>
     <div class='btn-group pull-right'>
-        <button id="spl_delete" class="btn" role="button" aria-disabled="false">Delete</button>
+        <button id="spl_delete" class="btn" role="button" aria-disabled="false"><? echo _("Delete") ?></button>
     </div>
     <div class='btn-group pull-right'>
         <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo $count > 0 ?"block;":"none;"?>">
-            <i class='crossfade-main-icon'></i><span class="ui-button-text">Playlist crossfade</span>
+            <i class='crossfade-main-icon'></i><span class="ui-button-text"><? echo _("Playlist crossfade") ?></span>
         </a>
     </div>
 <?php endif; ?>
@@ -45,7 +45,7 @@ if (isset($this->obj)) {
     <fieldset class="toggle closed" id="fieldset-metadate_change">
         <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
         <dl class="zend_form">
-            <dt id="description-label"><label for="description">Description</label></dt>
+            <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
                 <textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
             </dd>
@@ -75,5 +75,5 @@ if (isset($this->obj)) {
     </div>
 
 <?php else : ?>
-    <div>No open playlist</div>
+    <div><? echo _("No open playlist") ?></div>
 <?php endif; ?>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index dd36ffbfc..23b28f28b 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -10,21 +10,21 @@ if (isset($this->obj)) {
             New <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
-            <li id='lib-new-pl'><a href="#">New Playlist</a></li>
-            <li id='lib-new-bl'><a href="#">New Smart Block</a></li>
-            <li id='lib-new-ws'><a href="#">New Webstream</a></li>
+            <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>
+            <li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li>
+            <li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li>
         </ul>
     </div>
 <?php if (isset($this->obj)) : ?>
     <div class='btn-group pull-right'>
-        <button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button">Save</button>
+        <button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><? echo _("Save") ?></button>
     </div>
     <div class='btn-group pull-right'>
-        <button id="spl_delete" class="btn" role="button" aria-disabled="false">Delete</button>
+        <button id="spl_delete" class="btn" role="button" aria-disabled="false"><? echo _("Delete") ?></button>
     </div>
     <div class='btn-group pull-right'>
         <a href="#" id="spl_crossfade" class="btn crossfade-main-button" style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"block;":"none;"?>">
-            <i class='crossfade-main-icon'></i><span class="ui-button-text">Playlist crossfade</span>
+            <i class='crossfade-main-icon'></i><span class="ui-button-text"><? echo _("Playlist crossfade") ?></span>
         </a>
     </div>
 <?php endif; ?>
@@ -50,7 +50,7 @@ if (isset($this->obj)) {
     <fieldset class="toggle closed" id="fieldset-metadate_change">
         <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
         <dl class="zend_form">
-            <dt id="description-label"><label for="description">Description</label></dt>
+            <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
                 <textarea cols="80" rows="24" id="description" name="description"><?php
                     if (isset($this->unsavedDesc)) echo $this->unsavedDesc;
@@ -83,5 +83,5 @@ if (isset($this->obj)) {
     </div>
 
 <?php else : ?>
-    <div>No open smart block</div>
+    <div><? echo _("No open smart block") ?></div>
 <?php endif; ?>
diff --git a/airtime_mvc/application/views/scripts/plupload/upload.phtml b/airtime_mvc/application/views/scripts/plupload/upload.phtml
index 69977aa4c..481a0106c 100644
--- a/airtime_mvc/application/views/scripts/plupload/upload.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/upload.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Library</b> and script/action name <b>upload</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Library") ?></b> and script/action name <b>upload</b></center>
diff --git a/airtime_mvc/application/views/scripts/preference/directory-config.phtml b/airtime_mvc/application/views/scripts/preference/directory-config.phtml
index bdda1c46e..23b9919fa 100644
--- a/airtime_mvc/application/views/scripts/preference/directory-config.phtml
+++ b/airtime_mvc/application/views/scripts/preference/directory-config.phtml
@@ -1,4 +1,4 @@
 <div id="watched-folder-section" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong manage-folders">
-<h2>Manage Media Folders</h2>
+<h2><? echo _("Manage Media Folders") ?></h2>
 <?php echo $this->form; ?>
 </div>
diff --git a/airtime_mvc/application/views/scripts/preference/index.phtml b/airtime_mvc/application/views/scripts/preference/index.phtml
index 782b655a0..2e0635067 100644
--- a/airtime_mvc/application/views/scripts/preference/index.phtml
+++ b/airtime_mvc/application/views/scripts/preference/index.phtml
@@ -1,9 +1,9 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong preferences">
-<h2 style="float:left">Preferences</h2>
+<h2 style="float:left"><? echo _("Preferences") ?></h2>
 <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
 <form method="post" id="pref_form" enctype="application/x-www-form-urlencoded">
     
-    <button name="pref_save" id="pref_save" type="button" class="btn btn-small right-floated">Save</button>
+    <button name="pref_save" id="pref_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
     <div style="clear:both"></div>
     
     <?php
@@ -11,6 +11,6 @@
         echo $this->form;
     ?>
     <br />
-    <button name="pref_save" id="pref_save" type="button" class="btn btn-small right-floated">Save</button>
+    <button name="pref_save" id="pref_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
 </form>
 </div>
diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
index 086089689..60e4988e9 100644
--- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
+++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml
@@ -1,15 +1,15 @@
 <div class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong stream-config">
-    <h2 <?php if($this->enable_stream_conf == "true"){?>style="float:left"<?php }?>>Stream Settings</h2>
+    <h2 <?php if($this->enable_stream_conf == "true"){?>style="float:left"<?php }?>><? echo _("Stream Settings") ?></h2>
     <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
     <?php if($this->enable_stream_conf == "true"){?>
     <form method="post" id="stream_form" enctype="application/x-www-form-urlencoded">
-    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated">Save</button>
+    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
     <div style="clear:both"></div>
     <?php }?>
   <?php echo $this->statusMsg;?>
   <div style="float: left; margin-right: 10px; width: 490px; overflow: auto;">
     <fieldset class="padded stream-setting-global">
-        <legend>Global Settings</legend>
+        <legend><? echo _("Global Settings") ?></legend>
         <dl class="zend_form">
         <?php if($this->form->getElement('output_sound_device') != null){?>
             <dt id="hardwareOut-label">
@@ -69,7 +69,7 @@
   </div>
   <div style="float: left; width: 600px;">
     <fieldset class="padded">
-    <legend>Output Stream Settings</legend>
+    <legend><? echo _("Output Stream Settings") ?></legend>
     <?php
         for($i=1;$i<=$this->num_stream;$i++){
             echo $this->form->getSubform("s".$i."_subform");
@@ -78,7 +78,7 @@
     </fieldset>
     <?php if($this->enable_stream_conf == "true"){?>
     <br />
-    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated">Save</button>
+    <button name="stream_save" id="stream_save" type="button" class="btn btn-small right-floated"><? echo _("Save") ?></button>
     <?php }?>
   </div>
     </form>
diff --git a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
index 72a5d839b..cb045855c 100644
--- a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Recorder</b> and script/action name <b>getShowSchedule</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Recorder") ?></b> and script/action name <b>getShowSchedule</b></center>
diff --git a/airtime_mvc/application/views/scripts/recorder/index.phtml b/airtime_mvc/application/views/scripts/recorder/index.phtml
index 60ca18d3a..e3b8657a6 100644
--- a/airtime_mvc/application/views/scripts/recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Recorder</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Recorder") ?></b> and script/action name <b>index</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
index c83ccbc26..1255adb3f 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
@@ -1,22 +1,22 @@
 <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
     <div class="button-bar">
-        <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span>Close</a>
+        <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
         <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
             <span class="ui-icon ui-icon-plusthick"></span> 
             <span class="ui-button-text"><?php echo ($this->addNewShow ? "Add this show" : "Update show"); ?></span> 
         </button>
     </div>
     <div class="clear"></div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>What</h3>
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("What") ?></h3>
     <div id="schedule-show-what" class="collapsible-content">
         <?php echo $this->what; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("When") ?></h3>
     <div id="schedule-show-when" class="collapsible-content">
         <?php echo $this->when; ?>
         <?php echo $this->repeats; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>Live Stream Input</h3>
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Live Stream Input") ?></h3>
     <div id="live-stream-override" class="collapsible-content">
         <?php echo $this->live; ?>
     </div>
@@ -26,11 +26,11 @@
         <?php echo $this->absoluteRebroadcast; ?>
         <?php echo $this->rebroadcast; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>Who</h3>
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Who") ?></h3>
     <div id="schedule-show-who" class="collapsible-content">
         <?php echo $this->who; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>Style</h3>
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Style") ?></h3>
     <div id="schedule-show-style" class="collapsible-content">
         <?php echo $this->style; ?>
     </div>
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show.phtml b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
index 9802bc860..537169d2f 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>addShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>addShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
index 837c66731..893a7b716 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>cancelCurrentShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>cancelCurrentShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
index 1f2c21d35..576970be8 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>cancelShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>cancelShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
index 839707d86..316bcaa16 100644
--- a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>clearShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>clearShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
index ecfbea529..0dc01a16d 100644
--- a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>deleteShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>deleteShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
index 09f20573d..bf7cca988 100644
--- a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>eventFeed</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>eventFeed</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
index 0d6716767..3bbf52e1a 100644
--- a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>makeContextMenu</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>makeContextMenu</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/move-show.phtml b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
index e84d55e80..5a2cb9450 100644
--- a/airtime_mvc/application/views/scripts/schedule/move-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>moveShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>moveShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
index 4311a14bc..2582d891c 100644
--- a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>removeGroup</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>removeGroup</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
index 57f7c63be..25c4e42b5 100644
--- a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>Schedule</b> and script/action name <b>resizeShow</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>resizeShow</b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
index a935f3f99..09aadb4d8 100644
--- a/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
@@ -2,12 +2,12 @@
 <div><?php echo $this->additionalShowInfo; ?></div>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
     <tr>
-        <th>Start</th>
-        <th>Title</th>
-        <th>Creator</th>
-        <th>Album</th>
-        <th>Length</th>
-        <th>Genre</th>
+        <th><? echo _("Start") ?></th>
+        <th><? echo _("Title") ?></th>
+        <th><? echo _("Creator") ?></th>
+        <th><? echo _("Album") ?></th>
+        <th><? echo _("Length") ?></th>
+        <th><? echo _("Genre") ?></th>
     </tr>
 <?php $i=0; ?>
 <?php foreach($this->showContent as $row): ?>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
index 46ce9488e..45ad6c1c6 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
@@ -2,7 +2,7 @@
     <div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded">
         <div id="import_status" style="display:none">File import in progress...</div>
         <fieldset class="toggle closed" id="filter_options">
-            <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>Advanced Search Options</legend>
+            <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Advanced Search Options") ?></legend>
             <div id="advanced_search" class="advanced_search form-horizontal"></div>
         </fieldset>
         <table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
@@ -10,4 +10,4 @@
     <div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
         <table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/airtime_mvc/application/views/scripts/systemstatus/index.phtml b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
index d8fe2b940..901f790b2 100644
--- a/airtime_mvc/application/views/scripts/systemstatus/index.phtml
+++ b/airtime_mvc/application/views/scripts/systemstatus/index.phtml
@@ -1,17 +1,17 @@
 <table width="60%" cellpadding="0" cellspacing="0" border="0" class="statustable">
     	<thead>
         	<tr class="ui-state-default strong">
-            	<td>Service</td>
-            	<td>Status</td>
-            	<td>Uptime</td>
-            	<td>CPU</td>
-            	<td>Memory</td>
+            	<td><? echo _("Service") ?></td>
+            	<td><? echo _("Status") ?></td>
+            	<td><? echo _("Uptime") ?></td>
+            	<td><? echo _("CPU") ?></td>
+            	<td><? echo _("Memory") ?></td>
             </tr>
         </thead>
         <tbody>
             <!--
         	<tr class="odd">
-            	<td>Airtime Version</td>
+            	<td><? echo _("Airtime Version") ?></td>
             	<td>1.9.3</td>
             	<td>&nbsp;</td>
             </tr>
@@ -27,7 +27,7 @@
                 </tr>
             <?php endforeach; ?>
         	<tr id="partitions" class="even">
-            	<th colspan="5">Disk Space</th>
+            	<th colspan="5"><? echo _("Disk Space") ?></th>
             </tr>
         </tbody>
     </table>
diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml
index 023da880e..efc9cabd9 100644
--- a/airtime_mvc/application/views/scripts/user/add-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/add-user.phtml
@@ -1,6 +1,6 @@
 <div class="ui-widget ui-widget-content block-shadow clearfix padded-strong user-management">
 
-    <h2>Manage Users</h2>
+    <h2><? echo _("Manage Users") ?></h2>
     <div class="user-list-wrapper">
         <div id="users_wrapper" class="dataTables_wrapper">
 
@@ -14,8 +14,8 @@
             <table cellspacing="0" cellpadding="0" style="" id="users_datatable" class="datatable">
                 <thead>
                     <tr>
-                        <th>id</th>
-                        <th>Username</th>
+                        <th><? echo _("id") ?></th>
+                        <th><? echo _("Username") ?></th>
                         <th>First&nbsp;Name</th>
                         <th>Last&nbsp;Name</th>
                         <th>User&nbsp;Type</th>
diff --git a/airtime_mvc/application/views/scripts/user/get-hosts.phtml b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
index 1bee582a8..65452c1a1 100644
--- a/airtime_mvc/application/views/scripts/user/get-hosts.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>User</b> and script/action name <b>getHosts</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>getHosts</b></center>
diff --git a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
index 64b099bc2..607cfe6a2 100644
--- a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>User</b> and script/action name <b>getUserDataTableInfo</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>getUserDataTableInfo</b></center>
diff --git a/airtime_mvc/application/views/scripts/user/index.phtml b/airtime_mvc/application/views/scripts/user/index.phtml
index e53548c2c..6f0bbec25 100644
--- a/airtime_mvc/application/views/scripts/user/index.phtml
+++ b/airtime_mvc/application/views/scripts/user/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b>User</b> and script/action name <b>index</b></center>
\ No newline at end of file
+<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>index</b></center>
diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
index eb9574ffe..e282056b4 100644
--- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
@@ -4,18 +4,18 @@
             New <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
-            <li id='lib-new-pl'><a href="#">New Playlist</a></li>
-            <li id='lib-new-bl'><a href="#">New Smart Block</a></li>
-            <li id='lib-new-ws'><a href="#">New Webstream</a></li>
+            <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>
+            <li id='lib-new-bl'><a href="#"><? echo _("New Smart Block") ?></a></li>
+            <li id='lib-new-ws'><a href="#"><? echo _("New Webstream") ?></a></li>
         </ul>
     </div>
 
 <?php if (isset($this->obj)) : ?>
  <div class="btn-group pull-right">
-    <button class="btn btn-inverse" type="submit" id="webstream_save" name="submit">Save</button>
+    <button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><? echo _("Save") ?></button>
 </div>
 <div class="btn-group pull-right">
-    <button id="ws_delete" class="btn" <?php if ($this->action == "new"): ?>style="display:none;"<?php endif; ?>aria-disabled="false">Delete</button>
+    <button id="ws_delete" class="btn" <?php if ($this->action == "new"): ?>style="display:none;"<?php endif; ?>aria-disabled="false"><? echo _("Delete") ?></button>
 </div>
 <?php endif; ?>
 </div>
@@ -37,7 +37,7 @@
     <fieldset class="toggle" id="fieldset-metadate_change">
         <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
         <dl class="zend_form">
-            <dt id="description-label"><label for="description">Description</label></dt>
+            <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
                 <textarea cols="80" rows="24" id="description" name="description"><?php echo $this->obj->getDescription(); ?></textarea>
             </dd>
@@ -60,5 +60,5 @@
     </dl>
 
 <?php else : ?>
-    <div>No webstream</div>
+    <div><? echo _("No webstream") ?></div>
 <?php endif; ?>

From f0e2d5d2950eb68e945c5cd0d804613c74af54d1 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Tue, 13 Nov 2012 15:37:24 -0500
Subject: [PATCH 02/11] mass string change to _

---
 .../scripts/airtime-recorder/index.phtml      |  2 +-
 .../scripts/audiopreview/audio-preview.phtml  |  2 +-
 .../views/scripts/dashboard/about.phtml       |  4 +-
 .../views/scripts/dashboard/help.phtml        |  4 +-
 .../views/scripts/dashboard/index.phtml       |  2 +-
 .../scripts/dashboard/stream-player.phtml     |  2 +-
 .../views/scripts/error/denied.phtml          |  2 +-
 .../scripts/form/add-show-live-stream.phtml   |  2 +-
 .../form/add-show-rebroadcast-absolute.phtml  |  2 +-
 .../scripts/form/add-show-rebroadcast.phtml   |  2 +-
 .../views/scripts/form/preferences.phtml      |  2 +-
 .../scripts/form/preferences_livestream.phtml |  4 +-
 .../form/preferences_watched_dirs.phtml       |  4 +-
 .../views/scripts/form/register-dialog.phtml  |  2 +-
 .../scripts/form/smart-block-criteria.phtml   |  2 +-
 .../scripts/form/stream-setting-form.phtml    |  4 +-
 .../views/scripts/form/support-setting.phtml  |  2 +-
 .../views/scripts/index/display.phtml         |  2 +-
 .../views/scripts/index/main.phtml            |  2 +-
 .../views/scripts/index/newfield.phtml        |  2 +-
 .../library/get-file-metadata.ajax.phtml      | 72 +++++++++----------
 .../views/scripts/library/library.phtml       |  2 +-
 .../views/scripts/login/logout.phtml          |  2 +-
 .../views/scripts/login/password-change.phtml |  2 +-
 .../views/scripts/partialviews/header.phtml   |  6 +-
 .../views/scripts/playlist/playlist.phtml     |  6 +-
 .../views/scripts/playlist/set-cue.phtml      |  6 +-
 .../views/scripts/playlist/set-fade.phtml     |  4 +-
 .../views/scripts/playlist/smart-block.phtml  |  6 +-
 .../views/scripts/plupload/upload.phtml       |  2 +-
 .../scripts/recorder/get-show-schedule.phtml  |  2 +-
 .../views/scripts/recorder/index.phtml        |  2 +-
 .../views/scripts/schedule/add-show.phtml     |  2 +-
 .../schedule/cancel-current-show.phtml        |  2 +-
 .../views/scripts/schedule/cancel-show.phtml  |  2 +-
 .../views/scripts/schedule/clear-show.phtml   |  2 +-
 .../views/scripts/schedule/delete-show.phtml  |  2 +-
 .../views/scripts/schedule/event-feed.phtml   |  2 +-
 .../scripts/schedule/make-context-menu.phtml  |  2 +-
 .../views/scripts/schedule/move-show.phtml    |  2 +-
 .../views/scripts/schedule/remove-group.phtml |  2 +-
 .../views/scripts/schedule/resize-show.phtml  |  2 +-
 .../scripts/showbuilder/builderDialog.phtml   |  2 +-
 .../views/scripts/user/get-hosts.phtml        |  2 +-
 .../user/get-user-data-table-info.phtml       |  2 +-
 .../views/scripts/user/index.phtml            |  2 +-
 .../views/scripts/webstream/webstream.phtml   |  6 +-
 47 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
index 28044500a..c1d6d7d4a 100644
--- a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("AirtimeRecorder") ?></b> and script/action name <b>index</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("AirtimeRecorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index 789be01b3..490182ce8 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -42,7 +42,7 @@
                 </div>
                 <div class="jp-time-holder">
                     <div class="jp-current-time"></div>
-<?php if ($this->type == "audioclip"): ?><div class="jp-duration"></div> <?php endif;?>
+<?php if ($this->type == "audioclip"): ?><div class="jp-duration"></div><? echo _(" "); ?><?php endif;?>
                 </div>
             </div>
             <div class="jp-volume-block">
diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml
index 5a5ac1ace..12f355d4f 100644
--- a/airtime_mvc/application/views/scripts/dashboard/about.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml
@@ -1,8 +1,8 @@
 <div class="text-content">
     <h2><? echo _("About") ?></h2>
 <p>
-<a href="http://airtime.sourcefabric.org" target="_blank"><? echo _("Airtime") ?></a> <?php echo $this->airtime_version ?>, the open radio software for scheduling and remote station management.<br>
-© 2012 <a href="http://www.sourcefabric.org" target="_blank"><? echo _("Sourcefabric") ?></a> o.p.s. Airtime is distributed under the <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
+<a href="http://airtime.sourcefabric.org" target="_blank"><? echo _("Airtime") ?></a><? echo _(" "); ?><?php echo $this->airtime_version ?><? echo _(", the open radio software for scheduling and remote station management."); ?><br>
+© 2012 <a href="http://www.sourcefabric.org" target="_blank"><? echo _("Sourcefabric") ?></a><? echo _(" o.p.s. Airtime is distributed under the "); ?><a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
 </p>
 </div>
 <br>
diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml
index 425d04568..ffa080e47 100644
--- a/airtime_mvc/application/views/scripts/dashboard/help.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml
@@ -7,9 +7,9 @@
     <li>Begin by adding your files to the library using the "Add Media" menu button. You can drag and drop your files to this window too.</li>
     <li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.</li>
     <li>Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add / Remove Content".</li>
-    <li>Select your media from the left pane and drag them to your show in the right pane.</li>
+    <li><? echo _("Select your media from the left pane and drag them to your show in the right pane."); ?></li>
 </ol>
 <p><strong>Then you're good to go!</strong><br />
-For more detailed help, read the <a href="http://www.sourcefabric.org/en/airtime/manuals/" target="_blank"><? echo _("user manual") ?></a>.</p>
+For more detailed help, read the <a href="http://www.sourcefabric.org/en/airtime/manuals/" target="_blank"><? echo _("user manual") ?></a><? echo _("."); ?></p>
 </div>
 
diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml
index abb67f7f4..4b4a74137 100644
--- a/airtime_mvc/application/views/scripts/dashboard/index.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Dashboard") ?></b> and script/action name <b>index</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Dashboard") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index dbf5d052e..3f6a46dec 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -47,7 +47,7 @@ $(document).ready(function(){
 </script>
   <div class="jp-logo"><img id="logo-img" onload='resizeToMaxHeight(this, 40);' src="<?php echo $this->logo ?>" /></div>
         <div class="jp-stream">
-            <div class="jp-stream-text">Select stream:</div>
+            <div class="jp-stream-text"><? echo _("Select stream:"); ?></div>
                 
               <form id="form1" method="post" action="">
                 <select id="combo-box">
diff --git a/airtime_mvc/application/views/scripts/error/denied.phtml b/airtime_mvc/application/views/scripts/error/denied.phtml
index 23baf0661..6217eb227 100644
--- a/airtime_mvc/application/views/scripts/error/denied.phtml
+++ b/airtime_mvc/application/views/scripts/error/denied.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Error") ?></b> and script/action name <b>denied</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Error") ?></b><? echo _(" and script/action name "); ?><b><? echo _("denied"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
index 1ce5b8459..a2e9feb40 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml
@@ -50,7 +50,7 @@
             </dd>
         </div>
         <dt id="Connection_URL-label">
-            <label for="outputStreamURL">Connection URL: </label>
+            <label for="outputStreamURL"><? echo _("Connection URL: "); ?></label>
         </dt>
         <dd id="Connection_URL-element">
             <span id="stream_url" class="static_text"><?php echo $this->connection_url; ?></span>
diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
index 0e1dd34a1..b68bd5f76 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast-absolute.phtml
@@ -1,7 +1,7 @@
 <fieldset id="add_show_rebroadcast_absolute">
     <dl>
     <dt id="add_show_hosts_rebroadcast_day-label" class="block-display">
-        <label for="add_show_rebroadcast_day" class="optional">Choose Days:</label>
+        <label for="add_show_rebroadcast_day" class="optional"><? echo _("Choose Days:"); ?></label>
     </dt> 
     <dd id="add_show_rebroadcast_day-element" class="block-display clearfix">
     <ul class="formrow-repeat">
diff --git a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
index 960074d3d..954bfb83e 100644
--- a/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
+++ b/airtime_mvc/application/views/scripts/form/add-show-rebroadcast.phtml
@@ -1,7 +1,7 @@
 <fieldset id="add_show_rebroadcast_relative">
     <dl>
         <dt id="add_show_hosts_rebroadcast_repeat_day-label" class="block-display">
-          <label for="add_show_rebroadcast_repeat_day" class="optional">Repeat Days:</label>
+          <label for="add_show_rebroadcast_repeat_day" class="optional"><? echo _("Repeat Days:"); ?></label>
         </dt> 
         <dd id="add_show_rebroadcast_repeat_day-element" class="block-display clearfix">
             <ul class="formrow-repeat"> 
diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml
index 6cfea7722..f51e1bd5a 100644
--- a/airtime_mvc/application/views/scripts/form/preferences.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences.phtml
@@ -2,7 +2,7 @@
 
     <?php echo $this->element->getSubform('preferences_general') ?>
     
-    <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span>Email / Mail Server Settings</h3>
+    <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><? echo _("Email / Mail Server Settings"); ?></h3>
     <div class="collapsible-content" id="email-server-settings">
         <?php echo $this->element->getSubform('preferences_email_server') ?>
     </div>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 807221e10..46c394ce3 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -116,7 +116,7 @@
                 </span><br>
             <?php } ?>
             <div id="master_dj_connection_url_actions" style="display:none">
-                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
+                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a><? echo _("  "); ?><a href=# id="reset" style="font-size: 12px;"><? echo _("RESET"); ?></a>
             </div>
         </dd>
             <dt id="dj_harbor_input_port-label">
@@ -159,7 +159,7 @@
                 </span><br>
             <?php } ?>
             <div id="live_dj_connection_url_actions" style="display:none">
-                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a>  <a href=# id="reset" style="font-size: 12px;">RESET</a>
+                <a href=# id="ok" style="font-size: 12px;"><? echo _("OK") ?></a><? echo _("  "); ?><a href=# id="reset" style="font-size: 12px;"><? echo _("RESET"); ?></a>
             </div>
         </dd>
     </dl>
diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
index 93210b570..bbbda42d6 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -16,7 +16,7 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        <dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
+        <dd class="block-display selected-item"><strong><? echo _("Current Import Folder:"); ?></strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
 
         <dt id="watchedFolder-label" class="block-display">
             <label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>
@@ -47,7 +47,7 @@
             <?php endforeach; ?>
         <?php else: ?>
             <dd class="block-display selected-item">
-                <span>You are not watching any media folders.</span>
+                <span><? echo _("You are not watching any media folders."); ?></span>
             </dd>
         <?php endif; ?>
 
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index cddd440a9..287cc4fc2 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -24,7 +24,7 @@
                 </dd>
                 <dt class="block-display info-text">
                     Click the box below to advertise your station on 
-                    <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>. 
+                    <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false"><? echo _("Sourcefabric.org"); ?></a>. 
                     In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
                 </dt>
                 <dd id="publicize-element" class="block-display">
diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 962a9c491..f44080b8e 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -60,7 +60,7 @@
                 </a>
                 <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
                 <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
-                <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>> to <?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
+                <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><? echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
 
                 <a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'>
                     <i class='icon-white icon-remove'></i>
diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
index 088fc7aa2..29df7aaa2 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -1,7 +1,7 @@
         <?php 
         $s_name = "s".$this->stream_number;
         ?>
-        <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"closed":""?>"><span class="arrow-icon"></span>Stream <?php echo $this->stream_number?></h3>
+        <h3 class="collapsible-header <?php echo $this->stream_number == '1'?"closed":""?>"><span class="arrow-icon"></span><? echo _("Stream "); ?><?php echo $this->stream_number?></h3>
         <div class="stream-setting-content" <?php echo $this->enabled == 0?'style="display: none;':''?> id="<?php echo $s_name?>-config">
         <fieldset class="padded">
             <dl class="zend_form clearfix">
@@ -174,7 +174,7 @@
                 </dl>
             </fieldset>
             <dt id="outputStreamURL-label">
-                <label for="outputStreamURL">Stream URL: </label>
+                <label for="outputStreamURL"><? echo _("Stream URL: "); ?></label>
             </dt>
             <dd id="outputStreamURL-element">
                 <span id="stream_url" class="static_text"></span>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index e056f03bf..e4f6b535c 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -21,7 +21,7 @@
         </dd>
         <dd id="publicize-element" style="width:90%;">
             <div class="info-text">Click the box below to promote your station on 
-            <a id="link_to_whos_using" href="http://www.sourcefabric.org/en/airtime/whosusing/" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
+            <a id="link_to_whos_using" href="http://www.sourcefabric.org/en/airtime/whosusing/" onclick="window.open(this.href); return false"><? echo _("Sourcefabric.org"); ?></a>.
             </div>
             <label class="optional" for="Publicise">
                 <?php echo $this->element->getElement('Publicise') ?>
diff --git a/airtime_mvc/application/views/scripts/index/display.phtml b/airtime_mvc/application/views/scripts/index/display.phtml
index 95651f8a9..02beeaa17 100644
--- a/airtime_mvc/application/views/scripts/index/display.phtml
+++ b/airtime_mvc/application/views/scripts/index/display.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>display</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("display"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/index/main.phtml b/airtime_mvc/application/views/scripts/index/main.phtml
index e90f29c6f..5c6d8706e 100644
--- a/airtime_mvc/application/views/scripts/index/main.phtml
+++ b/airtime_mvc/application/views/scripts/index/main.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>main</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("main"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/index/newfield.phtml b/airtime_mvc/application/views/scripts/index/newfield.phtml
index 4c5d95a86..35649e60f 100644
--- a/airtime_mvc/application/views/scripts/index/newfield.phtml
+++ b/airtime_mvc/application/views/scripts/index/newfield.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Index") ?></b> and script/action name <b>newfield</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("newfield"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index 53adc86e0..74e37b23a 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -1,53 +1,53 @@
 <?php if($this->type == "audioclip") : ?>
 <table class='library-track-md'>
-<tr><td>Title:</td><td><?php echo ($this->md["MDATA_KEY_TITLE"]);?></td></tr>
-<tr><td>Creator:</td><td><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></td></tr>
-<tr><td>Album:</td><td><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></td></tr>
-<tr><td>Track:</td><td><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></td></tr>
-<tr><td>Length:</td><td><?php echo ($this->md["MDATA_KEY_DURATION"]);?></td></tr>
-<tr><td class='file-md-qtip-nowrap'>Sample Rate:</td><td><?php echo ($this->md["MDATA_KEY_SAMPLERATE"]);?></td></tr>
-<tr><td>Bit Rate:</td><td><?php echo ($this->md["MDATA_KEY_BITRATE"]);?></td></tr>
-<tr><td>Mood:</td><td><?php echo ($this->md["MDATA_KEY_MOOD"]);?></td></tr>
-<tr><td>Genre:</td><td><?php echo ($this->md["MDATA_KEY_GENRE"]);?></td></tr>
-<tr><td>Year:</td><td><?php echo ($this->md["MDATA_KEY_YEAR"]);?></td></tr>
-<tr><td>Label:</td><td><?php echo ($this->md["MDATA_KEY_LABEL"]);?></td></tr>
-<tr><td>BPM:</td><td><?php echo ($this->md["MDATA_KEY_BPM"]);?></td></tr>
-<tr><td>Composer:</td><td><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></td></tr>
-<tr><td>Conductor:</td><td><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></td></tr>
-<tr><td>Copyright:</td><td><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></td></tr>
-<tr><td>Isrc Number:</td><td><?php echo ($this->md["MDATA_KEY_ISRC"]);?></td></tr>
-<tr><td>Website:</td><td><?php echo ($this->md["MDATA_KEY_URL"]);?></td></tr>
-<tr><td>Language:</td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr>
+<tr><td><? echo _("Title:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TITLE"]);?></td></tr>
+<tr><td><? echo _("Creator:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CREATOR"]);?></td></tr>
+<tr><td><? echo _("Album:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SOURCE"]);?></td></tr>
+<tr><td><? echo _("Track:"); ?></td><td><?php echo ($this->md["MDATA_KEY_TRACKNUMBER"]);?></td></tr>
+<tr><td><? echo _("Length:"); ?></td><td><?php echo ($this->md["MDATA_KEY_DURATION"]);?></td></tr>
+<tr><td class='file-md-qtip-nowrap'><? echo _("Sample Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_SAMPLERATE"]);?></td></tr>
+<tr><td><? echo _("Bit Rate:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BITRATE"]);?></td></tr>
+<tr><td><? echo _("Mood:"); ?></td><td><?php echo ($this->md["MDATA_KEY_MOOD"]);?></td></tr>
+<tr><td><? echo _("Genre:"); ?></td><td><?php echo ($this->md["MDATA_KEY_GENRE"]);?></td></tr>
+<tr><td><? echo _("Year:"); ?></td><td><?php echo ($this->md["MDATA_KEY_YEAR"]);?></td></tr>
+<tr><td><? echo _("Label:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LABEL"]);?></td></tr>
+<tr><td><? echo _("BPM:"); ?></td><td><?php echo ($this->md["MDATA_KEY_BPM"]);?></td></tr>
+<tr><td><? echo _("Composer:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COMPOSER"]);?></td></tr>
+<tr><td><? echo _("Conductor:"); ?></td><td><?php echo ($this->md["MDATA_KEY_CONDUCTOR"]);?></td></tr>
+<tr><td><? echo _("Copyright:"); ?></td><td><?php echo ($this->md["MDATA_KEY_COPYRIGHT"]);?></td></tr>
+<tr><td><? echo _("Isrc Number:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ISRC"]);?></td></tr>
+<tr><td><? echo _("Website:"); ?></td><td><?php echo ($this->md["MDATA_KEY_URL"]);?></td></tr>
+<tr><td><? echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr>
 <tr><td>File&nbsp;Path:</td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr>
 </table>
 <?php endif; ?>
 
 <?php if($this->type == "playlist" || $this->type == "block") : ?>
 <div class='file-md-qtip-left'>
-    <span>Name:</span><span><?php echo ($this->md["dc:title"]);?></span><br />
-    <span>Creator:</span><span><?php echo ($this->md["dc:creator"]);?></span><br />
+    <span><? echo _("Name:"); ?></span><span><?php echo ($this->md["dc:title"]);?></span><br />
+    <span><? echo _("Creator:"); ?></span><span><?php echo ($this->md["dc:creator"]);?></span><br />
     <?php if ($this->type == "block" && $this->blType == "Dynamic") { ?>
-    <span>Length:</span><span><?php echo $this->block->getLength();?></span><br />
+    <span><? echo _("Length:"); ?></span><span><?php echo $this->block->getLength();?></span><br />
     <?php } else { ?>
-    <span>Length:</span><span><?php echo ($this->md["dcterms:extent"]);?></span><br />
+    <span><? echo _("Length:"); ?></span><span><?php echo ($this->md["dcterms:extent"]);?></span><br />
     <?php } ?>
-    <span>Description:</span><span><?php echo ($this->md["dc:description"]);?></span>
+    <span><? echo _("Description:"); ?></span><span><?php echo ($this->md["dc:description"]);?></span>
 </div>
 
 <?php if ($this->type == "playlist") { ?>
 <div class='file-md-qtip-legend'>
-<span class='webstream'><? echo _("o") ?></span> <span>Web Stream</span><br />
-<span class='dynamic'><? echo _("o") ?></span> <span>Dynamic Smart Block</span><br />
-<span class='static'><? echo _("o") ?></span> <span>Static Smart Block</span><br />
-<span><? echo _("o") ?></span> <span>Audio Track</span>
+<span class='webstream'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Web Stream"); ?></span><br />
+<span class='dynamic'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Dynamic Smart Block"); ?></span><br />
+<span class='static'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Static Smart Block"); ?></span><br />
+<span><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Audio Track"); ?></span>
 </div>
 <?php } ?>
 
     <?php if ($this->type == "playlist" || ($this->type == "block" && $this->blType == "Static")) {?>
         <?php if ($this->type == "playlist") { ?>
-            <div class='file-md-qtip-left'><span>Playlist Contents: </span></div>
+            <div class='file-md-qtip-left'><span><? echo _("Playlist Contents: "); ?></span></div>
         <?php } else { ?>
-            <div class='file-md-qtip-left'><span>Static Smart Block Contents: </span></div>
+            <div class='file-md-qtip-left'><span><? echo _("Static Smart Block Contents: "); ?></span></div>
         <?php } ?>
         <table class='library-get-file-md'>
         <?php foreach($this->contents as $row) : ?>
@@ -86,7 +86,7 @@
         </table>
         
     <?php } elseif ($this->blType == "Dynamic") { ?>
-        <div class='file-md-qtip-left'><span>Dynamic Smart Block Criteria: </span></div>
+        <div class='file-md-qtip-left'><span><? echo _("Dynamic Smart Block Criteria: "); ?></span></div>
         <table class='library-get-file-md table-small'>
         <?php foreach ($this->contents["crit"] as $criterias) : ?>
             <?php foreach ($criterias as $crit ) : ?>
@@ -116,7 +116,7 @@
         <?php endforeach; ?>
             <tr>
                 <td><? echo _("Limit to ") ?></td>
-                <td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
+                <td><?php echo $this->contents["limit"]["value"] ?><? echo _(" "); ?><?php echo $this->contents["limit"]["modifier"] ?></td>
             </tr>
         </table>
     <?php } ?>
@@ -124,11 +124,11 @@
 
 <?php if ($this->type == "stream") : ?>
 
-<div><span>Name:</span><span><?php echo ($this->md["name"]);?></span></div>
-<div><span>Length:</span><span><?php echo ($this->md["length"]);?></span></div>
-<div><span>Creator:</span><span><?php echo ($this->md["login"]);?></span></div>
-<div><span>Description:</span><span><?php echo ($this->md["description"]);?></span></div>
-<div><span>URL:</span><span><?php echo ($this->md["url"]);?></span></div>
+<div><span><? echo _("Name:"); ?></span><span><?php echo ($this->md["name"]);?></span></div>
+<div><span><? echo _("Length:"); ?></span><span><?php echo ($this->md["length"]);?></span></div>
+<div><span><? echo _("Creator:"); ?></span><span><?php echo ($this->md["login"]);?></span></div>
+<div><span><? echo _("Description:"); ?></span><span><?php echo ($this->md["description"]);?></span></div>
+<div><span><? echo _("URL:"); ?></span><span><?php echo ($this->md["url"]);?></span></div>
 
 
 <?php endif; ?>
diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml
index 7a3ca0503..66ce3e4e6 100644
--- a/airtime_mvc/application/views/scripts/library/library.phtml
+++ b/airtime_mvc/application/views/scripts/library/library.phtml
@@ -1,5 +1,5 @@
 <?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
-<div id="import_status" class="library_import" style="display:none">File import in progress...<img src=<?php $baseUrl . "/css/images/file_import_loader.gif"?>></img></div>
+<div id="import_status" class="library_import" style="display:none"><? echo _("File import in progress..."); ?><img src=<?php $baseUrl . "/css/images/file_import_loader.gif"?>></img></div>
 <fieldset class="toggle closed" id="filter_options">
     <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Advanced Search Options") ?></legend>
     <div id="advanced_search" class="advanced_search form-horizontal"></div>
diff --git a/airtime_mvc/application/views/scripts/login/logout.phtml b/airtime_mvc/application/views/scripts/login/logout.phtml
index e3a1a389c..fb1ab43f0 100644
--- a/airtime_mvc/application/views/scripts/login/logout.phtml
+++ b/airtime_mvc/application/views/scripts/login/logout.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Login") ?></b> and script/action name <b>logout</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Login") ?></b><? echo _(" and script/action name "); ?><b><? echo _("logout"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/login/password-change.phtml b/airtime_mvc/application/views/scripts/login/password-change.phtml
index 84ebac12a..d16778182 100644
--- a/airtime_mvc/application/views/scripts/login/password-change.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-change.phtml
@@ -3,7 +3,7 @@
   <h2><? echo _("New password") ?></h2>
   
   <div id="login" class="login-content clearfix">
-  <p class="light">Please enter and confirm your new password in the fields below.</p>
+  <p class="light"><? echo _("Please enter and confirm your new password in the fields below."); ?></p>
     <?php echo $this->form; ?>
   </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index 3d32c4f4e..e2fd0e871 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -1,13 +1,13 @@
 <div id="master-panel">
   <div class="now-playing-block">
-    <div class="text-row"><strong>Previous:</strong> <span id='previous'></span> <span id='prev-length'></span></div>
+    <div class="text-row"><strong><? echo _("Previous:"); ?></strong><? echo _(" "); ?><span id='previous'></span><? echo _(" "); ?><span id='prev-length'></span></div>
     <div class="now-playing-info song">
       <div class="time-flow"><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
-      <span id='current'></span> <span class="length" id="song-length"></span><? echo _(" ") ?></div>
+      <span id='current'></span><? echo _(" "); ?><span class="length" id="song-length"></span><? echo _(" ") ?></div>
     <div class="progressbar">
       <div class="progress-song" id="progress-bar" style="width:0%;"></div>
     </div>
-    <div class="text-row next-song"><strong>Next:</strong> <span id='next'></span> <span id='next-length'></span></div>
+    <div class="text-row next-song"><strong><? echo _("Next:"); ?></strong><? echo _(" "); ?><span id='next'></span><? echo _(" "); ?><span id='next-length'></span></div>
   </div>
     <div class="show-block">
       <div class="text-row">&nbsp;</div>
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index 42b3124e2..d5d4c55e1 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -43,7 +43,7 @@ if (isset($this->obj)) {
     <div id='sp-success' class='success' style='display:none'></div>
 
     <fieldset class="toggle closed" id="fieldset-metadate_change">
-        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
+        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend>
         <dl class="zend_form">
             <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
@@ -57,10 +57,10 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
       	<span class="ui-icon ui-icon-closethick sp-closethick-center"></span>
 	    <dl id="spl_editor-main" class="inline-list">
-            <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
-            <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
index 5d18a5643..bdc203433 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
@@ -1,14 +1,14 @@
 <dl id="spl_cue_editor" class="inline-list">
-    <dt>Cue In: <span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
+    <dt><? echo _("Cue In: "); ?><span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
     <dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span>
     </dd>
     <dd class="edit-error"></dd>
-    <dt>Cue Out: <span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
+    <dt><? echo _("Cue Out: "); ?><span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
     <dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span>
     </dd>
     <dd class="edit-error"></dd>
-    <dt>Original Length:</dt>
+    <dt><? echo _("Original Length:"); ?></dt>
     <dd id="spl_original"><span><?php echo $this->origLength; ?></span></dd>
 </dl>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
index 3eed6e47f..b5719fca5 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
@@ -1,13 +1,13 @@
 <dl id="spl_editor" class="inline-list">
     <?php if ($this->item1Type == 0) {?>
-    <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
+    <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
     <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
     </dd>
     <dd class="edit-error"></dd>
     <?php }
     if ($this->item2Type == 0) {?>
-    <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
+    <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
     <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
     </dd>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index 23b28f28b..5d8e19bfe 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -48,7 +48,7 @@ if (isset($this->obj)) {
     <div id='sp-success-saved' class='success' style='display:none'></div>
 
     <fieldset class="toggle closed" id="fieldset-metadate_change">
-        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
+        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend>
         <dl class="zend_form">
             <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
@@ -65,10 +65,10 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
       	<span class="ui-icon ui-icon-closethick"></span>
 	    <dl id="spl_editor-main" class="inline-list">
-            <dt>Fade in: <span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
-            <dt>Fade out: <span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
diff --git a/airtime_mvc/application/views/scripts/plupload/upload.phtml b/airtime_mvc/application/views/scripts/plupload/upload.phtml
index 481a0106c..f5bdf10e3 100644
--- a/airtime_mvc/application/views/scripts/plupload/upload.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/upload.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Library") ?></b> and script/action name <b>upload</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Library") ?></b><? echo _(" and script/action name "); ?><b><? echo _("upload"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
index cb045855c..926577075 100644
--- a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Recorder") ?></b> and script/action name <b>getShowSchedule</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Recorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getShowSchedule"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/recorder/index.phtml b/airtime_mvc/application/views/scripts/recorder/index.phtml
index e3b8657a6..df61e6170 100644
--- a/airtime_mvc/application/views/scripts/recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Recorder") ?></b> and script/action name <b>index</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Recorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show.phtml b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
index 537169d2f..26e3bca4e 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>addShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("addShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
index 893a7b716..c2446a08a 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>cancelCurrentShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("cancelCurrentShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
index 576970be8..2fda81da7 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>cancelShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("cancelShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
index 316bcaa16..9247dd187 100644
--- a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>clearShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("clearShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
index 0dc01a16d..de6b6761c 100644
--- a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>deleteShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("deleteShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
index bf7cca988..2073b4b29 100644
--- a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>eventFeed</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("eventFeed"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
index 3bbf52e1a..3f7a4775f 100644
--- a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>makeContextMenu</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("makeContextMenu"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/move-show.phtml b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
index 5a2cb9450..711bf18ba 100644
--- a/airtime_mvc/application/views/scripts/schedule/move-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>moveShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("moveShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
index 2582d891c..27d996297 100644
--- a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>removeGroup</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("removeGroup"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
index 25c4e42b5..b676100ea 100644
--- a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("Schedule") ?></b> and script/action name <b>resizeShow</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("resizeShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
index 45ad6c1c6..09de7e118 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml
@@ -1,6 +1,6 @@
 <div class="wrapper">
     <div id="library_content" class="lib-content tabs ui-widget ui-widget-content block-shadow alpha-block padded">
-        <div id="import_status" style="display:none">File import in progress...</div>
+        <div id="import_status" style="display:none"><? echo _("File import in progress..."); ?></div>
         <fieldset class="toggle closed" id="filter_options">
             <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("Advanced Search Options") ?></legend>
             <div id="advanced_search" class="advanced_search form-horizontal"></div>
diff --git a/airtime_mvc/application/views/scripts/user/get-hosts.phtml b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
index 65452c1a1..693045e35 100644
--- a/airtime_mvc/application/views/scripts/user/get-hosts.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>getHosts</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getHosts"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
index 607cfe6a2..a7182a5ce 100644
--- a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>getUserDataTableInfo</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getUserDataTableInfo"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/user/index.phtml b/airtime_mvc/application/views/scripts/user/index.phtml
index 6f0bbec25..00b89a16a 100644
--- a/airtime_mvc/application/views/scripts/user/index.phtml
+++ b/airtime_mvc/application/views/scripts/user/index.phtml
@@ -1 +1 @@
-<br /><br /><center>View script for controller <b><? echo _("User") ?></b> and script/action name <b>index</b></center>
+<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
index e282056b4..5e8ff45db 100644
--- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
@@ -35,7 +35,7 @@
     </div>
 
     <fieldset class="toggle" id="fieldset-metadate_change">
-        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span>View / edit description</legend>
+        <legend style="cursor: pointer;"><span class="ui-icon ui-icon-triangle-2-n-s"></span><? echo _("View / edit description"); ?></legend>
         <dl class="zend_form">
             <dt id="description-label"><label for="description"><? echo _("Description") ?></label></dt>
             <dd id="description-element">
@@ -48,12 +48,12 @@
     <dl class="zend_form">
         <dt id="submit-label" style="display: none;">&nbsp;</dt>
         <div id="url-error" class="errors" style="display:none;"></div>
-        <dt id="streamurl-label"><label for="streamurl">Stream URL:</label></dt>
+        <dt id="streamurl-label"><label for="streamurl"><? echo _("Stream URL:"); ?></label></dt>
         <dd id="streamurl-element">
         <input type="text" value="<?php echo $this->obj->getUrl(); ?>" size="40"/>
         </dd>
         <div id="length-error" class="errors" style="display:none;"></div>
-        <dt id="streamlength-label"><label for="streamlength">Default Length:</label></dt>
+        <dt id="streamlength-label"><label for="streamlength"><? echo _("Default Length:"); ?></label></dt>
         <dd id="streamlength-element">
         <input type="text" value="<?php echo $this->obj->getDefaultLength() ?>"/>
         </dd>

From b173b6dda4e753ddd1af3c82a08338b3850effa9 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 10:59:06 -0500
Subject: [PATCH 03/11] CC-1960: Internationalize Airtime / Support
 translations

-added gettext wrapper functions for all strings in view/scripts, and forms
---
 airtime_mvc/application/Bootstrap.php         |  11 +
 .../forms/AddShowAbsoluteRebroadcastDates.php |   8 +-
 .../application/forms/AddShowLiveStream.php   |  12 +-
 airtime_mvc/application/forms/AddShowRR.php   |   4 +-
 .../forms/AddShowRebroadcastDates.php         |   8 +-
 .../application/forms/AddShowRepeats.php      |  10 +-
 .../application/forms/AddShowStyle.php        |   4 +-
 airtime_mvc/application/forms/AddShowWhat.php |   8 +-
 airtime_mvc/application/forms/AddShowWhen.php |  34 +--
 airtime_mvc/application/forms/AddShowWho.php  |   4 +-
 airtime_mvc/application/forms/AddUser.php     |  30 +-
 airtime_mvc/application/forms/DateRange.php   |   8 +-
 airtime_mvc/application/forms/EditAudioMD.php |  34 +--
 .../forms/EmailServerPreferences.php          |  16 +-
 .../application/forms/GeneralPreferences.php  |  13 +-
 .../forms/LiveStreamingPreferences.php        |  38 +--
 airtime_mvc/application/forms/Login.php       |   8 +-
 .../application/forms/PasswordChange.php      |   6 +-
 .../application/forms/PasswordRestore.php     |   8 +-
 .../application/forms/RegisterAirtime.php     |  27 +-
 airtime_mvc/application/forms/ShowBuilder.php |  12 +-
 .../application/forms/SmartBlockCriteria.php  | 261 ++++++++++--------
 .../forms/SoundcloudPreferences.php           |  18 +-
 .../application/forms/StreamSetting.php       |  14 +-
 .../forms/StreamSettingSubForm.php            |  48 ++--
 .../application/forms/SupportSettings.php     |  29 +-
 .../forms/WatchedDirPreferences.php           |   6 +-
 .../scripts/airtime-recorder/index.phtml      |   1 -
 .../scripts/audiopreview/audio-preview.phtml  |   6 +-
 .../views/scripts/dashboard/about.phtml       |  17 +-
 .../views/scripts/dashboard/help.phtml        |  18 +-
 .../views/scripts/dashboard/index.phtml       |   1 -
 .../views/scripts/error/denied.phtml          |   1 -
 .../views/scripts/error/error.phtml           |   4 +-
 .../views/scripts/form/daterange.phtml        |   2 +-
 .../scripts/form/preferences_livestream.phtml |   6 +-
 .../scripts/form/preferences_soundcloud.phtml |   4 +-
 .../form/preferences_watched_dirs.phtml       |   4 +-
 .../views/scripts/form/register-dialog.phtml  |  24 +-
 .../views/scripts/form/showbuilder.phtml      |   2 +-
 .../scripts/form/smart-block-criteria.phtml   |   6 +-
 .../scripts/form/stream-setting-form.phtml    |  10 +-
 .../views/scripts/form/support-setting.phtml  |  25 +-
 .../views/scripts/index/display.phtml         |   1 -
 .../views/scripts/index/main.phtml            |   1 -
 .../views/scripts/index/newfield.phtml        |   1 -
 .../library/get-file-metadata.ajax.phtml      |  12 +-
 .../views/scripts/listenerstat/index.phtml    |   2 +-
 .../views/scripts/login/index.phtml           |   4 +-
 .../views/scripts/login/logout.phtml          |   1 -
 .../scripts/login/password-restore.phtml      |   4 +-
 .../views/scripts/partialviews/header.phtml   |   8 +-
 .../views/scripts/partialviews/trialBox.phtml |   2 +-
 .../views/scripts/playlist/playlist.phtml     |   2 +-
 .../views/scripts/playlist/set-cue.phtml      |   4 +-
 .../views/scripts/playlist/set-fade.phtml     |   4 +-
 .../views/scripts/playlist/smart-block.phtml  |   6 +-
 .../views/scripts/playlist/update.phtml       |   8 +-
 .../views/scripts/plupload/upload.phtml       |   1 -
 .../scripts/recorder/get-show-schedule.phtml  |   1 -
 .../views/scripts/recorder/index.phtml        |   1 -
 .../scripts/schedule/add-show-form.phtml      |   6 +-
 .../views/scripts/schedule/add-show.phtml     |   1 -
 .../schedule/cancel-current-show.phtml        |   1 -
 .../views/scripts/schedule/cancel-show.phtml  |   1 -
 .../views/scripts/schedule/clear-show.phtml   |   1 -
 .../views/scripts/schedule/delete-show.phtml  |   1 -
 .../views/scripts/schedule/event-feed.phtml   |   1 -
 .../scripts/schedule/make-context-menu.phtml  |   1 -
 .../views/scripts/schedule/move-show.phtml    |   1 -
 .../views/scripts/schedule/remove-group.phtml |   1 -
 .../views/scripts/schedule/resize-show.phtml  |   1 -
 .../views/scripts/showbuilder/index.phtml     |   2 +-
 .../views/scripts/user/add-user.phtml         |   8 +-
 .../views/scripts/user/get-hosts.phtml        |   1 -
 .../user/get-user-data-table-info.phtml       |   1 -
 .../views/scripts/user/index.phtml            |   1 -
 .../views/scripts/webstream/webstream.phtml   |   2 +-
 78 files changed, 481 insertions(+), 423 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 6b52c2a9c..f670353fa 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -31,6 +31,17 @@ Zend_Validate::setDefaultNamespaces("Zend");
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin(new RabbitMqPlugin());
 
+//localization configuration
+$lang = 'en_US.utf8';
+putenv("LC_ALL=$lang");
+putenv("LANG=$lang");
+$res = setlocale(LC_MESSAGES, $lang);
+
+$domain = 'airtime';
+bindtextdomain($domain, '/usr/share/airtime/locale');
+textdomain($domain);
+bind_textdomain_codeset($domain,'UTF-8');
+
 
 /* The bootstrap class should only be used to initialize actions that return a view.
    Actions that return JSON will not use the bootstrap class! */
diff --git a/airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php b/airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php
index 8bfa71b2f..a2f5b5cf3 100644
--- a/airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php
+++ b/airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php
@@ -23,7 +23,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
             $text->setAttrib('class', 'input_text');
             $text->addFilter('StringTrim');
             $text->addValidator('date', false, array('HH:mm'));
-            $text->addValidator('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'));
+            $text->addValidator('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')));
             $text->setRequired(false);
             $text->setDecorators(array('ViewHelper'));
             $this->addElement($text);
@@ -55,12 +55,12 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
             }
 
             if (trim($day) == "") {
-                $this->getElement('add_show_rebroadcast_date_absolute_'.$i)->setErrors(array("Day must be specified"));
+                $this->getElement('add_show_rebroadcast_date_absolute_'.$i)->setErrors(array(_("Day must be specified")));
                 $valid = false;
             }
 
             if (trim($time) == "") {
-                $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Time must be specified"));
+                $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array(_("Time must be specified")));
                 $valid = false;
             }
 
@@ -83,7 +83,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
             $rebroad_start = new DateTime($rebroad_start);
 
             if ($rebroad_start < $show_end) {
-                $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast"));
+                $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array(_("Must wait at least 1 hour to rebroadcast")));
                 $valid = false;
                 $noError = false;
             }
diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php
index b241a54f0..b34aab2e5 100644
--- a/airtime_mvc/application/forms/AddShowLiveStream.php
+++ b/airtime_mvc/application/forms/AddShowLiveStream.php
@@ -7,13 +7,13 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
     public function init()
     {
         $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth");
-        $cb_airtime_auth->setLabel("Use Airtime Authentication:")
+        $cb_airtime_auth->setLabel(_("Use Airtime Authentication:"))
                           ->setRequired(false)
                           ->setDecorators(array('ViewHelper'));
         $this->addElement($cb_airtime_auth);
 
         $cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth");
-        $cb_custom_auth  ->setLabel("Use Custom Authentication:")
+        $cb_custom_auth  ->setLabel(_("Use Custom Authentication:"))
                             ->setRequired(false)
                             ->setDecorators(array('ViewHelper'));
         $this->addElement($cb_custom_auth);
@@ -23,7 +23,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
         $custom_username->setAttrib('class', 'input_text')
                         ->setAttrib('autocomplete', 'off')
                         ->setAllowEmpty(true)
-                        ->setLabel('Custom Username')
+                        ->setLabel(_('Custom Username'))
                         ->setFilters(array('StringTrim'))
                         ->setValidators(array(
                             new ConditionalNotEmpty(array("cb_custom_auth"=>"1"))))
@@ -36,7 +36,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
                         ->setAttrib('autocomplete', 'off')
                         ->setAttrib('renderPassword','true')
                         ->setAllowEmpty(true)
-                        ->setLabel('Custom Password')
+                        ->setLabel(_('Custom Password'))
                         ->setFilters(array('StringTrim'))
                         ->setValidators(array(
                             new ConditionalNotEmpty(array("cb_custom_auth"=>"1"))))
@@ -60,12 +60,12 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm
         if ($data['cb_custom_auth'] == 1) {
             if (trim($data['custom_username']) == '') {
                 $element = $this->getElement("custom_username");
-                $element->addError("Username field cannot be empty.");
+                $element->addError(_("Username field cannot be empty."));
                 $isValid = false;
             }
             if (trim($data['custom_password']) == '') {
                 $element = $this->getElement("custom_password");
-                $element->addError("Password field cannot be empty.");
+                $element->addError(_("Password field cannot be empty."));
                 $isValid = false;
             }
         }
diff --git a/airtime_mvc/application/forms/AddShowRR.php b/airtime_mvc/application/forms/AddShowRR.php
index 5c33723b6..f1fc4fcfd 100644
--- a/airtime_mvc/application/forms/AddShowRR.php
+++ b/airtime_mvc/application/forms/AddShowRR.php
@@ -7,13 +7,13 @@ class Application_Form_AddShowRR extends Zend_Form_SubForm
     {
         // Add record element
         $this->addElement('checkbox', 'add_show_record', array(
-            'label'      => 'Record from Line In?',
+            'label'      => _('Record from Line In?'),
             'required'   => false,
         ));
 
         // Add record element
         $this->addElement('checkbox', 'add_show_rebroadcast', array(
-            'label'      => 'Rebroadcast?',
+            'label'      => _('Rebroadcast?'),
             'required'   => false,
         ));
     }
diff --git a/airtime_mvc/application/forms/AddShowRebroadcastDates.php b/airtime_mvc/application/forms/AddShowRebroadcastDates.php
index 7bf0ea3a4..d05dfcba3 100644
--- a/airtime_mvc/application/forms/AddShowRebroadcastDates.php
+++ b/airtime_mvc/application/forms/AddShowRebroadcastDates.php
@@ -28,7 +28,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
             $text->setAttrib('class', 'input_text');
             $text->addFilter('StringTrim');
             $text->addValidator('date', false, array('HH:mm'));
-            $text->addValidator('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'));
+            $text->addValidator('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')));
             $text->setRequired(false);
             $text->setDecorators(array('ViewHelper'));
             $this->addElement($text);
@@ -60,12 +60,12 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
             }
 
             if (trim($days) == "") {
-                $this->getElement('add_show_rebroadcast_date_'.$i)->setErrors(array("Day must be specified"));
+                $this->getElement('add_show_rebroadcast_date_'.$i)->setErrors(array(_("Day must be specified")));
                 $valid = false;
             }
 
             if (trim($time) == "") {
-                $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Time must be specified"));
+                $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array(_("Time must be specified")));
                 $valid = false;
             }
 
@@ -92,7 +92,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
             $rebroad_start->add(new DateInterval("P".$day."D"));
 
             if ($rebroad_start < $show_end) {
-                $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast"));
+                $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array(_("Must wait at least 1 hour to rebroadcast")));
                 $valid = false;
                 $noError = false;
             }
diff --git a/airtime_mvc/application/forms/AddShowRepeats.php b/airtime_mvc/application/forms/AddShowRepeats.php
index 85bb7cb44..0028e1711 100644
--- a/airtime_mvc/application/forms/AddShowRepeats.php
+++ b/airtime_mvc/application/forms/AddShowRepeats.php
@@ -8,7 +8,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
         //Add type select
         $this->addElement('select', 'add_show_repeat_type', array(
             'required' => true,
-            'label' => 'Repeat Type:',
+            'label' => _('Repeat Type:'),
             'class' => ' input_select',
             'multiOptions' => array(
                 "0" => "weekly",
@@ -22,7 +22,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
             'multiCheckbox',
             'add_show_day_check',
             array(
-                'label' => 'Select Days:',
+                'label' => _('Select Days:'),
                 'required' => false,
                 'multiOptions' => array(
                     "0" => "Sun",
@@ -37,7 +37,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
 
         // Add end date element
         $this->addElement('text', 'add_show_end_date', array(
-            'label'      => 'Date End:',
+            'label'      => _('Date End:'),
             'class'      => 'input_text',
             'value'     => date("Y-m-d"),
             'required'   => false,
@@ -50,7 +50,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
 
         // Add no end element
         $this->addElement('checkbox', 'add_show_no_end', array(
-            'label'      => 'No End?',
+            'label'      => _('No End?'),
             'required'   => false,
             'checked' => true,
         ));
@@ -76,7 +76,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
             $end_epoch = strtotime($end_timestamp);
 
             if ($end_epoch < $start_epoch) {
-                $this->getElement('add_show_end_date')->setErrors(array('End date must be after start date'));
+                $this->getElement('add_show_end_date')->setErrors(array(_('End date must be after start date')));
 
                 return false;
             }
diff --git a/airtime_mvc/application/forms/AddShowStyle.php b/airtime_mvc/application/forms/AddShowStyle.php
index 6ea301874..5f897f6ea 100644
--- a/airtime_mvc/application/forms/AddShowStyle.php
+++ b/airtime_mvc/application/forms/AddShowStyle.php
@@ -7,7 +7,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
     {
        // Add show background-color input
         $this->addElement('text', 'add_show_background_color', array(
-            'label'      => 'Background Colour:',
+            'label'      => _('Background Colour:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
@@ -26,7 +26,7 @@ class Application_Form_AddShowStyle extends Zend_Form_SubForm
 
     // Add show color input
         $this->addElement('text', 'add_show_color', array(
-            'label'      => 'Text Colour:',
+            'label'      => _('Text Colour:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
diff --git a/airtime_mvc/application/forms/AddShowWhat.php b/airtime_mvc/application/forms/AddShowWhat.php
index 7a092f4b5..436bcef07 100644
--- a/airtime_mvc/application/forms/AddShowWhat.php
+++ b/airtime_mvc/application/forms/AddShowWhat.php
@@ -22,7 +22,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
 
         // Add name element
         $this->addElement('text', 'add_show_name', array(
-            'label'      => 'Name:',
+            'label'      => _('Name:'),
             'class'      => 'input_text',
             'required'   => true,
             'filters'    => array('StringTrim'),
@@ -33,7 +33,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
 
          // Add URL element
         $this->addElement('text', 'add_show_url', array(
-            'label'      => 'URL:',
+            'label'      => _('URL:'),
             'class'      => 'input_text',
             'required'   => false,
             'filters'    => array('StringTrim'),
@@ -42,7 +42,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
 
          // Add genre element
         $this->addElement('text', 'add_show_genre', array(
-            'label'      => 'Genre:',
+            'label'      => _('Genre:'),
             'class'      => 'input_text',
             'required'   => false,
             'filters'    => array('StringTrim'),
@@ -51,7 +51,7 @@ class Application_Form_AddShowWhat extends Zend_Form_SubForm
 
          // Add the description element
         $this->addElement('textarea', 'add_show_description', array(
-            'label'      => 'Description:',
+            'label'      => _('Description:'),
             'required'   => false,
             'class'      => 'input_text_area',
             'validators' => array(array('StringLength', false, array(0, $maxLens['description'])))
diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index e6d164022..cd406593f 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -13,7 +13,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $startDate = new Zend_Form_Element_Text('add_show_start_date');
         $startDate->class = 'input_text';
         $startDate->setRequired(true)
-                    ->setLabel('Date/Time Start:')
+                    ->setLabel(_('Date/Time Start:'))
                     ->setValue(date("Y-m-d"))
                     ->setFilters(array('StringTrim'))
                     ->setValidators(array(
@@ -32,7 +32,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                     ->setValidators(array(
                         'NotEmpty',
                         array('date', false, array('HH:mm')),
-                        array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Time format should be HH:mm'))
+                        array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Time format should be HH:mm')))
                         ))->setDecorators(array('ViewHelper'));
         $startTime->setAttrib('alt', 'time');
         $this->addElement($startTime);
@@ -41,7 +41,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $endDate = new Zend_Form_Element_Text('add_show_end_date_no_repeat');
         $endDate->class = 'input_text';
         $endDate->setRequired(true)
-                    ->setLabel('Date/Time End:')
+                    ->setLabel(_('Date/Time End:'))
                     ->setValue(date("Y-m-d"))
                     ->setFilters(array('StringTrim'))
                     ->setValidators(array(
@@ -60,14 +60,14 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                     ->setValidators(array(
                         'NotEmpty',
                         array('date', false, array('HH:mm')),
-                        array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Time format should be HH:mm'))))
+                        array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Time format should be HH:mm')))))
                     ->setDecorators(array('ViewHelper'));
         $endTime->setAttrib('alt', 'time');
         $this->addElement($endTime);
 
         // Add duration element
         $this->addElement('text', 'add_show_duration', array(
-            'label'      => 'Duration:',
+            'label'      => _('Duration:'),
             'class'      => 'input_text',
             'value'      => '01h 00m',
             'readonly'   => true,
@@ -76,7 +76,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
 
         // Add repeats element
         $this->addElement('checkbox', 'add_show_repeats', array(
-            'label'      => 'Repeats?',
+            'label'      => _('Repeats?'),
             'required'   => false,
             'decorators'  => array('ViewHelper')
         ));
@@ -96,7 +96,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $showEndDateTime = new DateTime($end_time);
         if ($validateStartDate) {
             if ($showStartDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
-                $this->getElement('add_show_start_time')->setErrors(array('Cannot create show in the past'));
+                $this->getElement('add_show_start_time')->setErrors(array(_('Cannot create show in the past')));
                 $valid = false;
             }
             // if edit action, check if original show start time is in the past. CC-3864
@@ -104,7 +104,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                 if ($originalStartDate->getTimestamp() < $nowDateTime->getTimestamp()) {
                     $this->getElement('add_show_start_time')->setValue($originalStartDate->format("H:i"));
                     $this->getElement('add_show_start_date')->setValue($originalStartDate->format("Y-m-d"));
-                    $this->getElement('add_show_start_time')->setErrors(array('Cannot modify start date/time of the show that is already started'));
+                    $this->getElement('add_show_start_time')->setErrors(array(_('Cannot modify start date/time of the show that is already started')));
                     $this->disableStartDateAndTime();
                     $valid = false;
                 }
@@ -113,7 +113,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
 
         // if end time is in the past, return error
         if ($showEndDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
-            $this->getElement('add_show_end_time')->setErrors(array('End date/time cannot be in the past'));
+            $this->getElement('add_show_end_time')->setErrors(array(_('End date/time cannot be in the past')));
             $valid = false;
         }
 
@@ -123,15 +123,15 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
             $hours = $matches[1];
             $minutes = $matches[2];
             if ($formData["add_show_duration"] == "00h 00m") {
-                $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00h 00m'));
+                $this->getElement('add_show_duration')->setErrors(array(_('Cannot have duration 00h 00m')));
                 $valid = false;
             } elseif (strpos($formData["add_show_duration"], 'h') !== false && $hours >= 24) {
                 if ($hours > 24 || ($hours == 24 && $minutes > 0)) {
-                    $this->getElement('add_show_duration')->setErrors(array('Cannot have duration greater than 24h'));
+                    $this->getElement('add_show_duration')->setErrors(array(_('Cannot have duration greater than 24h')));
                     $valid = false;
                 }
             } elseif ( strstr($formData["add_show_duration"], '-') ) {
-                $this->getElement('add_show_duration')->setErrors(array('Cannot have duration < 0m'));
+                $this->getElement('add_show_duration')->setErrors(array(_('Cannot have duration < 0m')));
                 $valid = false;
             }
         } else {
@@ -247,7 +247,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                             
                             if ($overlapping) {
                                 $valid = false;
-                                $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
+                                $this->getElement('add_show_duration')->setErrors(array(_('Cannot schedule overlapping shows')));
                                 break 1;
                             } else {
                                 $repeatShowStart->setTimezone($localTimezone);
@@ -261,7 +261,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                     }
                 } else {
                     $valid = false;
-                    $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
+                    $this->getElement('add_show_duration')->setErrors(array(_('Cannot schedule overlapping shows')));
                 }
             } elseif ($formData["add_show_rebroadcast"]) {
                 /* Check first show
@@ -284,18 +284,18 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
                         $overlapping = Application_Model_Schedule::checkOverlappingShows($rebroadcastShowStart, $rebroadcastShowEnd, $update, $instanceId);
                         if ($overlapping) {
                             $valid = false;
-                            $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
+                            $this->getElement('add_show_duration')->setErrors(array(_('Cannot schedule overlapping shows')));
                             break;
                         }
                     }
                 } else {
                     $valid = false;
-                    $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
+                    $this->getElement('add_show_duration')->setErrors(array(_('Cannot schedule overlapping shows')));
                 }
             } else {
               $overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
                 if ($overlapping) {
-                    $this->getElement('add_show_duration')->setErrors(array('Cannot schedule overlapping shows'));
+                    $this->getElement('add_show_duration')->setErrors(array(_('Cannot schedule overlapping shows')));
                     $valid = false;
                 }
             }
diff --git a/airtime_mvc/application/forms/AddShowWho.php b/airtime_mvc/application/forms/AddShowWho.php
index 71d9f9fcc..aba16e110 100644
--- a/airtime_mvc/application/forms/AddShowWho.php
+++ b/airtime_mvc/application/forms/AddShowWho.php
@@ -7,7 +7,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
     {
         // Add hosts autocomplete
         $this->addElement('text', 'add_show_hosts_autocomplete', array(
-            'label'      => 'Search Users:',
+            'label'      => _('Search Users:'),
             'class'      => 'input_text ui-autocomplete-input',
             'required'   => false
         ));
@@ -21,7 +21,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
 
         //Add hosts selection
         $hosts = new Zend_Form_Element_MultiCheckbox('add_show_hosts');
-        $hosts->setLabel('DJs:')
+        $hosts->setLabel(_('DJs:'))
             ->setMultiOptions($options);
 
         $this->addElement($hosts);
diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index 080c41bff..47141365b 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -18,7 +18,7 @@ class Application_Form_AddUser extends Zend_Form
         $this->addElement($hidden);
 
         $login = new Zend_Form_Element_Text('login');
-        $login->setLabel('Username:');
+        $login->setLabel(_('Username:'));
         $login->setAttrib('class', 'input_text');
         $login->setRequired(true);
         $login->addFilter('StringTrim');
@@ -26,7 +26,7 @@ class Application_Form_AddUser extends Zend_Form
         $this->addElement($login);
 
         $password = new Zend_Form_Element_Password('password');
-        $password->setLabel('Password:');
+        $password->setLabel(_('Password:'));
         $password->setAttrib('class', 'input_text');
         $password->setRequired(true);
         $password->addFilter('StringTrim');
@@ -34,21 +34,21 @@ class Application_Form_AddUser extends Zend_Form
         $this->addElement($password);
 
         $firstName = new Zend_Form_Element_Text('first_name');
-        $firstName->setLabel('Firstname:');
+        $firstName->setLabel(_('Firstname:'));
         $firstName->setAttrib('class', 'input_text');
         $firstName->addFilter('StringTrim');
         $firstName->addValidator('NotEmpty');
         $this->addElement($firstName);
 
         $lastName = new Zend_Form_Element_Text('last_name');
-        $lastName->setLabel('Lastname:');
+        $lastName->setLabel(_('Lastname:'));
         $lastName->setAttrib('class', 'input_text');
         $lastName->addFilter('StringTrim');
         $lastName->addValidator('NotEmpty');
         $this->addElement($lastName);
 
         $email = new Zend_Form_Element_Text('email');
-        $email->setLabel('Email:');
+        $email->setLabel(_('Email:'));
         $email->setAttrib('class', 'input_text');
         $email->addFilter('StringTrim');
         $email->setRequired(true);
@@ -56,33 +56,33 @@ class Application_Form_AddUser extends Zend_Form
         $this->addElement($email);
 
         $cellPhone = new Zend_Form_Element_Text('cell_phone');
-        $cellPhone->setLabel('Mobile Phone:');
+        $cellPhone->setLabel(_('Mobile Phone:'));
         $cellPhone->setAttrib('class', 'input_text');
         $cellPhone->addFilter('StringTrim');
         $this->addElement($cellPhone);
 
         $skype = new Zend_Form_Element_Text('skype');
-        $skype->setLabel('Skype:');
+        $skype->setLabel(_('Skype:'));
         $skype->setAttrib('class', 'input_text');
         $skype->addFilter('StringTrim');
         $this->addElement($skype);
 
         $jabber = new Zend_Form_Element_Text('jabber');
-        $jabber->setLabel('Jabber:');
+        $jabber->setLabel(_('Jabber:'));
         $jabber->setAttrib('class', 'input_text');
         $jabber->addFilter('StringTrim');
         $jabber->addValidator('EmailAddress');
         $this->addElement($jabber);
 
         $select = new Zend_Form_Element_Select('type');
-        $select->setLabel('User Type:');
+        $select->setLabel(_('User Type:'));
         $select->setAttrib('class', 'input_select');
         $select->setAttrib('style', 'width: 40%');
         $select->setMultiOptions(array(
-                "G" => "Guest",
-                "H" => "DJ",
-                "P" => "Program Manager",
-                "A" => "Admin"
+                "G" => _("Guest"),
+                "H" => _("DJ"),
+                "P" => _("Program Manager"),
+                "A" => _("Admin")
             ));
         $select->setRequired(true);
         $this->addElement($select);
@@ -90,7 +90,7 @@ class Application_Form_AddUser extends Zend_Form
         $saveBtn = new Zend_Form_Element_Button('save_user');
         $saveBtn->setAttrib('class', 'btn btn-small right-floated');
         $saveBtn->setIgnore(true);
-        $saveBtn->setLabel('Save');
+        $saveBtn->setLabel(_('Save'));
         $this->addElement($saveBtn);
     }
 
@@ -100,7 +100,7 @@ class Application_Form_AddUser extends Zend_Form
             $count = CcSubjsQuery::create()->filterByDbLogin($data['login'])->count();
 
             if ($count != 0) {
-                $this->getElement('login')->setErrors(array("Login name is not unique."));
+                $this->getElement('login')->setErrors(array(_("Login name is not unique.")));
 
                 return false;
             }
diff --git a/airtime_mvc/application/forms/DateRange.php b/airtime_mvc/application/forms/DateRange.php
index 5d04696ed..4d8dd3570 100644
--- a/airtime_mvc/application/forms/DateRange.php
+++ b/airtime_mvc/application/forms/DateRange.php
@@ -13,7 +13,7 @@ class Application_Form_DateRange extends Zend_Form_SubForm
         $startDate = new Zend_Form_Element_Text('his_date_start');
         $startDate->class = 'input_text';
         $startDate->setRequired(true)
-                  ->setLabel('Date Start:')
+                  ->setLabel(_('Date Start:'))
                   ->setValue(date("Y-m-d"))
                   ->setFilters(array('StringTrim'))
                   ->setValidators(array(
@@ -32,7 +32,7 @@ class Application_Form_DateRange extends Zend_Form_SubForm
                   ->setValidators(array(
                       'NotEmpty',
                       array('date', false, array('HH:mm')),
-                      array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'))))
+                      array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')))))
                   ->setDecorators(array('ViewHelper'));
         $startTime->setAttrib('alt', 'time');
         $this->addElement($startTime);
@@ -41,7 +41,7 @@ class Application_Form_DateRange extends Zend_Form_SubForm
         $endDate = new Zend_Form_Element_Text('his_date_end');
         $endDate->class = 'input_text';
         $endDate->setRequired(true)
-                ->setLabel('Date End:')
+                ->setLabel(_('Date End:'))
                 ->setValue(date("Y-m-d"))
                 ->setFilters(array('StringTrim'))
                 ->setValidators(array(
@@ -60,7 +60,7 @@ class Application_Form_DateRange extends Zend_Form_SubForm
                 ->setValidators(array(
                     'NotEmpty',
                     array('date', false, array('HH:mm')),
-                    array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'))))
+                    array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         $endTime->setAttrib('alt', 'time');
         $this->addElement($endTime);
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 219742b3f..577dbeeec 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -10,42 +10,42 @@ class Application_Form_EditAudioMD extends Zend_Form
 
         // Add title field
         $this->addElement('text', 'track_title', array(
-            'label'      => 'Title:',
+            'label'      => _('Title:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
         ));
 
         // Add artist field
         $this->addElement('text', 'artist_name', array(
-            'label'      => 'Creator:',
+            'label'      => _('Creator:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
         ));
 
         // Add album field
         $this->addElement('text', 'album_title', array(
-            'label'      => 'Album:',
+            'label'      => _('Album:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add track number field
         $this->addElement('text', 'track_number', array(
-            'label'      => 'Track:',
+            'label'      => _('Track:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add genre field
         $this->addElement('text', 'genre', array(
-            'label'      => 'Genre:',
+            'label'      => _('Genre:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add year field
         $this->addElement('text', 'year', array(
-            'label'      => 'Year:',
+            'label'      => _('Year:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
             'validators' => array(
@@ -57,28 +57,28 @@ class Application_Form_EditAudioMD extends Zend_Form
 
         // Add label field
         $this->addElement('text', 'label', array(
-            'label'      => 'Label:',
+            'label'      => _('Label:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add composer field
         $this->addElement('text', 'composer', array(
-            'label'      => 'Composer:',
+            'label'      => _('Composer:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add conductor field
         $this->addElement('text', 'conductor', array(
-            'label'      => 'Conductor:',
+            'label'      => _('Conductor:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add mood field
         $this->addElement('text', 'mood', array(
-            'label'      => 'Mood:',
+            'label'      => _('Mood:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
@@ -86,7 +86,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add bmp field
         $bpm = new Zend_Form_Element_Text('bpm');
         $bpm->class = 'input_text';
-        $bpm->setLabel('BPM:')
+        $bpm->setLabel(_('BPM:'))
             ->setFilters(array('StringTrim'))
             ->setValidators(array(
                         new Zend_Validate_StringLength(array('min'=>0,'max' => 8)),
@@ -95,28 +95,28 @@ class Application_Form_EditAudioMD extends Zend_Form
 
         // Add copyright field
         $this->addElement('text', 'copyright', array(
-            'label'      => 'Copyright:',
+            'label'      => _('Copyright:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add isrc number field
         $this->addElement('text', 'isrc_number', array(
-            'label'      => 'ISRC Number:',
+            'label'      => _('ISRC Number:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add website field
         $this->addElement('text', 'info_url', array(
-            'label'      => 'Website:',
+            'label'      => _('Website:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
 
         // Add language field
         $this->addElement('text', 'language', array(
-            'label'      => 'Language:',
+            'label'      => _('Language:'),
             'class'      => 'input_text',
             'filters'    => array('StringTrim')
         ));
@@ -125,7 +125,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
             'class'    => 'btn',
-            'label'    => 'Save',
+            'label'    => _('Save'),
             'decorators' => array(
                 'ViewHelper'
             )
@@ -135,7 +135,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('button', 'cancel', array(
             'ignore'   => true,
             'class'    => 'btn md-cancel',
-            'label'    => 'Cancel',
+            'label'    => _('Cancel'),
             'onclick' => 'javascript:document.location.href="'.$baseUrl.'/Library"',
             'decorators' => array(
                 'ViewHelper'
diff --git a/airtime_mvc/application/forms/EmailServerPreferences.php b/airtime_mvc/application/forms/EmailServerPreferences.php
index 03c73dae9..4bf390390 100644
--- a/airtime_mvc/application/forms/EmailServerPreferences.php
+++ b/airtime_mvc/application/forms/EmailServerPreferences.php
@@ -14,7 +14,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
 
         // Enable system emails
         $this->addElement('checkbox', 'enableSystemEmail', array(
-            'label' => 'Enable System Emails (Password Reset)',
+            'label' => _('Enable System Emails (Password Reset)'),
             'required' => false,
             'value' => Application_Model_Preference::GetEnableSystemEmail(),
             'decorators' => array(
@@ -24,14 +24,14 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'systemEmail', array(
             'class' => 'input_text',
-            'label' => 'Reset Password \'From\' Email',
+            'label' => _("Reset Password 'From' Email"),
             'value' => Application_Model_Preference::GetSystemEmail(),
             'readonly' => true,
             'decorators' => array('viewHelper')
         ));
 
         $this->addElement('checkbox', 'configureMailServer', array(
-            'label' => 'Configure Mail Server',
+            'label' => _('Configure Mail Server'),
             'required' => false,
             'value' => Application_Model_Preference::GetMailServerConfigured(),
             'decorators' => array (
@@ -40,7 +40,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
         ));
 
         $this->addElement('checkbox', 'msRequiresAuth', array(
-            'label' => 'Requires Authentication',
+            'label' => _('Requires Authentication'),
             'required' => false,
             'value' => Application_Model_Preference::GetMailServerRequiresAuth(),
             'decorators' => array(
@@ -50,7 +50,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'mailServer', array(
             'class' => 'input_text',
-            'label' => 'Mail Server',
+            'label' => _('Mail Server'),
             'value' => Application_Model_Preference::GetMailServer(),
             'readonly' => true,
             'decorators' => array('viewHelper'),
@@ -64,7 +64,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'email', array(
             'class' => 'input_text',
-            'label' => 'Email Address',
+            'label' => _('Email Address'),
             'value' => Application_Model_Preference::GetMailServerEmailAddress(),
             'readonly' => true,
             'decorators' => array('viewHelper'),
@@ -79,7 +79,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
 
         $this->addElement('password', 'ms_password', array(
             'class' => 'input_text',
-            'label' => 'Password',
+            'label' => _('Password'),
             'value' => Application_Model_Preference::GetMailServerPassword(),
             'readonly' => true,
             'decorators' => array('viewHelper'),
@@ -97,7 +97,7 @@ class Application_Form_EmailServerPreferences extends Zend_Form_SubForm
         $port->class = 'input_text';
         $port->setRequired(false)
             ->setValue(Application_Model_Preference::GetMailServerPort())
-            ->setLabel('Port')
+            ->setLabel(_('Port'))
             ->setAttrib('readonly', true)
             ->setDecorators(array('viewHelper'));
 
diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 815d46779..7db3b8660 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -18,7 +18,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         //Station name
         $this->addElement('text', 'stationName', array(
             'class'      => 'input_text',
-            'label'      => 'Station Name',
+            'label'      => _('Station Name'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => Application_Model_Preference::GetStationName(),
@@ -30,12 +30,12 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         //Default station fade
         $this->addElement('text', 'stationDefaultFade', array(
             'class'      => 'input_text',
-            'label'      => 'Default Fade (s):',
+            'label'      => _('Default Fade (s):'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'validators' => array(array('regex', false,
                 array('/^[0-9]{1,2}(\.\d{1})?$/',
-                'messages' => 'enter a time in seconds 0{.0}'))),
+                'messages' => _('enter a time in seconds 0{.0}')))),
             'value' => $defaultFade,
             'decorators' => array(
                 'ViewHelper'
@@ -43,7 +43,8 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         ));
 
         $third_party_api = new Zend_Form_Element_Radio('thirdPartyApi');
-        $third_party_api->setLabel('Allow Remote Websites To Access "Schedule" Info?<br> (Enable this to make front-end widgets work.)');
+        $third_party_api->setLabel(
+            sprintf(_('Allow Remote Websites To Access "Schedule" Info?%s (Enable this to make front-end widgets work.'), '<br>'));
         $third_party_api->setMultiOptions(array("Disabled",
                                             "Enabled"));
         $third_party_api->setValue(Application_Model_Preference::GetAllow3rdPartyApi());
@@ -52,7 +53,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 
         /* Form Element for setting the Timezone */
         $timezone = new Zend_Form_Element_Select("timezone");
-        $timezone->setLabel("Timezone");
+        $timezone->setLabel(_("Timezone"));
         $timezone->setMultiOptions($this->getTimezones());
         $timezone->setValue(Application_Model_Preference::GetTimezone());
         $timezone->setDecorators(array('ViewHelper'));
@@ -60,7 +61,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 
         /* Form Element for setting which day is the start of the week */
         $week_start_day = new Zend_Form_Element_Select("weekStartDay");
-        $week_start_day->setLabel("Week Starts On");
+        $week_start_day->setLabel(_("Week Starts On"));
         $week_start_day->setMultiOptions($this->getWeekStartDays());
         $week_start_day->setValue(Application_Model_Preference::GetWeekStartDay());
         $week_start_day->setDecorators(array('ViewHelper'));
diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php
index 6bef2be12..546d1650e 100644
--- a/airtime_mvc/application/forms/LiveStreamingPreferences.php
+++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php
@@ -16,24 +16,24 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 
         // automatic trasition on source disconnection
         $auto_transition = new Zend_Form_Element_Checkbox("auto_transition");
-        $auto_transition->setLabel("Auto Switch Off")
+        $auto_transition->setLabel(_("Auto Switch Off"))
                         ->setValue(Application_Model_Preference::GetAutoTransition())
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($auto_transition);
 
         // automatic switch on upon source connection
         $auto_switch = new Zend_Form_Element_Checkbox("auto_switch");
-        $auto_switch->setLabel("Auto Switch On")
+        $auto_switch->setLabel(_("Auto Switch On"))
                         ->setValue(Application_Model_Preference::GetAutoSwitch())
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($auto_switch);
 
         // Default transition fade
         $transition_fade = new Zend_Form_Element_Text("transition_fade");
-        $transition_fade->setLabel("Switch Transition Fade (s)")
+        $transition_fade->setLabel(_("Switch Transition Fade (s)"))
                         ->setFilters(array('StringTrim'))
                         ->addValidator('regex', false, array('/^[0-9]{1,2}(\.\d{1,6})?$/',
-                        'messages' => 'enter a time in seconds 00{.000000}'))
+                        'messages' => _('enter a time in seconds 00{.000000}')))
                         ->setValue($defaultFade)
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($transition_fade);
@@ -42,7 +42,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         $master_username = new Zend_Form_Element_Text('master_username');
         $master_username->setAttrib('autocomplete', 'off')
                         ->setAllowEmpty(true)
-                        ->setLabel('Master Username')
+                        ->setLabel(_('Master Username'))
                         ->setFilters(array('StringTrim'))
                         ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername())
                         ->setDecorators(array('ViewHelper'));
@@ -59,7 +59,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                         ->setAttrib('renderPassword','true')
                         ->setAllowEmpty(true)
                         ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword())
-                        ->setLabel('Master Password')
+                        ->setLabel(_('Master Password'))
                         ->setFilters(array('StringTrim'))
                         ->setDecorators(array('ViewHelper'));
         $this->addElement($master_password);
@@ -67,7 +67,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         //Master source connection url
         $master_dj_connection_url = new Zend_Form_Element_Text('master_dj_connection_url');
         $master_dj_connection_url->setAttrib('readonly', true)
-                                 ->setLabel('Master Source Connection URL')
+                                 ->setLabel(_('Master Source Connection URL'))
                                  ->setValue(Application_Model_Preference::GetMasterDJSourceConnectionURL())
                                  ->setDecorators(array('ViewHelper'));
         $this->addElement($master_dj_connection_url);
@@ -75,7 +75,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         //Show source connection url
         $live_dj_connection_url = new Zend_Form_Element_Text('live_dj_connection_url');
         $live_dj_connection_url->setAttrib('readonly', true)
-                                 ->setLabel('Show Source Connection URL')
+                                 ->setLabel(_('Show Source Connection URL'))
                                  ->setValue(Application_Model_Preference::GetLiveDJSourceConnectionURL())
                                  ->setDecorators(array('ViewHelper'));
         $this->addElement($live_dj_connection_url);
@@ -83,38 +83,38 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
         //liquidsoap harbor.input port
             $m_port = Application_Model_StreamSetting::getMasterLiveStreamPort();
             $master_dj_port = new Zend_Form_Element_Text('master_harbor_input_port');
-            $master_dj_port->setLabel("Master Source Port")
+            $master_dj_port->setLabel(_("Master Source Port"))
                     ->setValue($m_port)
                     ->setValidators(array(new Zend_Validate_Between(array('min'=>1024, 'max'=>49151))))
-                    ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
+                    ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>_('Only numbers are allowed.'))))
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($master_dj_port);
 
             $m_mount = Application_Model_StreamSetting::getMasterLiveStreamMountPoint();
             $master_dj_mount = new Zend_Form_Element_Text('master_harbor_input_mount_point');
-            $master_dj_mount->setLabel("Master Source Mount Point")
+            $master_dj_mount->setLabel(_("Master Source Mount Point"))
                     ->setValue($m_mount)
                     ->setValidators(array(
-                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($master_dj_mount);
 
             //liquidsoap harbor.input port
             $l_port = Application_Model_StreamSetting::getDjLiveStreamPort();
             $live_dj_port = new Zend_Form_Element_Text('dj_harbor_input_port');
-            $live_dj_port->setLabel("Show Source Port")
+            $live_dj_port->setLabel(_("Show Source Port"))
                     ->setValue($l_port)
                     ->setValidators(array(new Zend_Validate_Between(array('min'=>1024, 'max'=>49151))))
-                    ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
+                    ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>_('Only numbers are allowed.'))))
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($live_dj_port);
 
             $l_mount = Application_Model_StreamSetting::getDjLiveStreamMountPoint();
             $live_dj_mount = new Zend_Form_Element_Text('dj_harbor_input_mount_point');
-            $live_dj_mount->setLabel("Show Source Mount Point")
+            $live_dj_mount->setLabel(_("Show Source Mount Point"))
                     ->setValue($l_mount)
                     ->setValidators(array(
-                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                            array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($live_dj_mount);
         // demo only code
@@ -149,7 +149,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
 
             if ($master_harbor_input_port == $dj_harbor_input_port && $master_harbor_input_port != "") {
                 $element = $this->getElement("dj_harbor_input_port");
-                $element->addError("You cannot use same port as Master DJ port.");
+                $element->addError(_("You cannot use same port as Master DJ port."));
                 $isValid = false;
             }
             if ($master_harbor_input_port != "") {
@@ -160,7 +160,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                             socket_bind($sock, 0, $master_harbor_input_port);
                         } catch (Exception $e) {
                             $element = $this->getElement("master_harbor_input_port");
-                            $element->addError("Port '$master_harbor_input_port' is not available.");
+                            $element->addError(sprintf(_("Port %s is not available"), $master_harbor_input_port));
                             $isValid = false;
                         }
                         
@@ -178,7 +178,7 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm
                             socket_bind($sock, 0, $dj_harbor_input_port);
                         } catch (Exception $e) {
                             $element = $this->getElement("dj_harbor_input_port");
-                            $element->addError("Port '$dj_harbor_input_port' is not available.");
+                            $element->addError(sprintf(_("Port %s is not available"). $dj_harbor_input_port));
                             $isValid = false;
                         }
                         socket_close($sock);
diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php
index 3761ff939..bd1deb806 100644
--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@@ -16,7 +16,7 @@ class Application_Form_Login extends Zend_Form
 
         // Add username element
         $this->addElement('text', 'username', array(
-            'label'      => 'Username:',
+            'label'      => _('Username:'),
             'class'      => 'input_text',
             'required'   => true,
             'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
@@ -31,7 +31,7 @@ class Application_Form_Login extends Zend_Form
 
         // Add password element
         $this->addElement('password', 'password', array(
-            'label'      => 'Password:',
+            'label'      => _('Password:'),
             'class'      => 'input_text',
             'required'   => true,
             'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
@@ -56,7 +56,7 @@ class Application_Form_Login extends Zend_Form
         // Add the submit button
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
-            'label'    => 'Login',
+            'label'    => _('Login'),
             'class'      => 'ui-button ui-widget ui-state-default ui-button-text-only center',
             'decorators' => array(
                 'ViewHelper'
@@ -74,7 +74,7 @@ class Application_Form_Login extends Zend_Form
 
         $captcha = new Zend_Form_Element_Captcha('captcha',
             array(
-                'label' => 'Type the characters you see in the picture below.',
+                'label' => _('Type the characters you see in the picture below.'),
                 'captcha' =>  'ReCaptcha',
                 'captchaOptions'        => array(
                     'captcha'   => 'ReCaptcha',
diff --git a/airtime_mvc/application/forms/PasswordChange.php b/airtime_mvc/application/forms/PasswordChange.php
index 48efae5ff..152263fe6 100644
--- a/airtime_mvc/application/forms/PasswordChange.php
+++ b/airtime_mvc/application/forms/PasswordChange.php
@@ -11,7 +11,7 @@ class Application_Form_PasswordChange extends Zend_Form
         ));
 
         $this->addElement('password', 'password', array(
-            'label' => 'Password',
+            'label' => _('Password'),
             'required' => true,
             'filters' => array('stringTrim'),
             'validators' => array(
@@ -23,7 +23,7 @@ class Application_Form_PasswordChange extends Zend_Form
         ));
 
         $this->addElement('password', 'password_confirm', array(
-            'label' => 'Confirm new password',
+            'label' => _('Confirm new password'),
             'required' => true,
             'filters' => array('stringTrim'),
             'validators' => array(
@@ -38,7 +38,7 @@ class Application_Form_PasswordChange extends Zend_Form
         ));
 
         $this->addElement('submit', 'submit', array(
-            'label' => 'Get new password',
+            'label' => _('Get new password'),
             'ignore' => true,
             'class' => 'ui-button ui-widget ui-state-default ui-button-text-only center',
             'decorators' => array(
diff --git a/airtime_mvc/application/forms/PasswordRestore.php b/airtime_mvc/application/forms/PasswordRestore.php
index 584e767ad..0e8f4ad9c 100644
--- a/airtime_mvc/application/forms/PasswordRestore.php
+++ b/airtime_mvc/application/forms/PasswordRestore.php
@@ -11,7 +11,7 @@ class Application_Form_PasswordRestore extends Zend_Form
         ));
 
         $this->addElement('text', 'email', array(
-            'label' => 'E-mail',
+            'label' => _('E-mail'),
             'required' => true,
             'filters' => array(
                 'stringTrim',
@@ -22,7 +22,7 @@ class Application_Form_PasswordRestore extends Zend_Form
         ));
 
         $this->addElement('text', 'username', array(
-            'label' => 'Username',
+            'label' => _('Username'),
             'required' => false,
             'filters' => array(
                 'stringTrim',
@@ -33,7 +33,7 @@ class Application_Form_PasswordRestore extends Zend_Form
         ));
 
         $this->addElement('submit', 'submit', array(
-            'label' => 'Restore password',
+            'label' => _('Restore password'),
             'ignore' => true,
             'class' => 'ui-button ui-widget ui-state-default ui-button-text-only center',
             'decorators' => array(
@@ -43,7 +43,7 @@ class Application_Form_PasswordRestore extends Zend_Form
 
         $cancel = new Zend_Form_Element_Button("cancel");
         $cancel->class = 'ui-button ui-widget ui-state-default ui-button-text-only center';
-        $cancel->setLabel("Cancel")
+        $cancel->setLabel(_("Cancel"))
                ->setIgnore(True)
                ->setAttrib('onclick', 'redirectToLogin();')
                ->setDecorators(array('ViewHelper'));
diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 9ffd853e1..8c4af94c6 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -27,7 +27,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // Station Name
         $stnName = new Zend_Form_Element_Text("stnName");
-        $stnName->setLabel("Station Name")
+        $stnName->setLabel(_("Station Name"))
                 ->setRequired(true)
                 ->setValue(Application_Model_Preference::GetStationName())
                 ->setDecorators(array('ViewHelper'));
@@ -36,7 +36,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         // Phone number
         $this->addElement('text', 'Phone', array(
             'class'      => 'input_text',
-            'label'      => 'Phone:',
+            'label'      => _('Phone:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value'      => Application_Model_Preference::GetPhone(),
@@ -48,7 +48,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         //Email
         $this->addElement('text', 'Email', array(
             'class'      => 'input_text',
-            'label'      => 'Email:',
+            'label'      => _('Email:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value'      => Application_Model_Preference::GetEmail(),
@@ -59,7 +59,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
          // Station Web Site
         $this->addElement('text', 'StationWebSite', array(
-            'label'      => 'Station Web Site:',
+            'label'      => _('Station Web Site:'),
             'required'   => false,
             'class'      => 'input_text',
             'value' => Application_Model_Preference::GetStationWebSite(),
@@ -70,7 +70,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // county list dropdown
         $this->addElement('select', 'Country', array(
-            'label'        => 'Country:',
+            'label'        => _('Country:'),
             'required'     => false,
             'value'        => Application_Model_Preference::GetStationCountry(),
             'multiOptions' => $country_list,
@@ -81,7 +81,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // Station city
         $this->addElement('text', 'City', array(
-            'label'      => 'City:',
+            'label'      => _('City:'),
             'required'   => false,
             'class'      => 'input_text',
             'value' => Application_Model_Preference::GetStationCity(),
@@ -93,7 +93,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         // Station Description
         $description = new Zend_Form_Element_Textarea('Description');
         $description->class = 'input_text_area';
-        $description->setLabel('Station Description:')
+        $description->setLabel(_('Station Description:'))
                     ->setRequired(false)
                     ->setValue(Application_Model_Preference::GetStationDescription())
                     ->setDecorators(array('ViewHelper'))
@@ -103,7 +103,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // Station Logo
         $upload = new Zend_Form_Element_File('Logo');
-        $upload->setLabel('Station Logo:')
+        $upload->setLabel(_('Station Logo:'))
                 ->setRequired(false)
                 ->setDecorators(array('File'))
                 ->addValidator('Count', false, 1)
@@ -113,7 +113,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         //enable support feedback
         $this->addElement('checkbox', 'SupportFeedback', array(
-            'label'      => 'Send support feedback',
+            'label'      => _('Send support feedback'),
             'required'   => false,
             'value' => 1,
             'decorators' => array(
@@ -123,7 +123,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // checkbox for publicise
         $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
-        $checkboxPublicise->setLabel('Promote my station on Sourcefabric.org')
+        $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
                           ->setRequired(false)
                           ->setDecorators(array('ViewHelper'))
                           ->setValue(Application_Model_Preference::GetPublicise());
@@ -145,7 +145,10 @@ class Application_Form_RegisterAirtime extends Zend_Form
 
         // checkbox for privacy policy
         $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
-        $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.")
+        $checkboxPrivacy->setLabel(
+            sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
+                "<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
+                "</a>"))
             ->setDecorators(array('ViewHelper'));
         $this->addElement($checkboxPrivacy);
     }
@@ -160,7 +163,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
         if (isset($data["Privacy"])) {
             $checkPrivacy = $this->getElement('Privacy');
             if ($data["SupportFeedback"] == "1" && $data["Privacy"] != "1") {
-                $checkPrivacy->addError("You have to agree to privacy policy.");
+                $checkPrivacy->addError(_("You have to agree to privacy policy."));
                 $isValid = false;
             }
         }
diff --git a/airtime_mvc/application/forms/ShowBuilder.php b/airtime_mvc/application/forms/ShowBuilder.php
index 465d2dd71..291caccc2 100644
--- a/airtime_mvc/application/forms/ShowBuilder.php
+++ b/airtime_mvc/application/forms/ShowBuilder.php
@@ -15,7 +15,7 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
         $startDate = new Zend_Form_Element_Text('sb_date_start');
         $startDate->class = 'input_text';
         $startDate->setRequired(true)
-                  ->setLabel('Date Start:')
+                  ->setLabel(_('Date Start:'))
                   ->setValue(date("Y-m-d"))
                   ->setFilters(array('StringTrim'))
                   ->setValidators(array(
@@ -34,7 +34,7 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
                   ->setValidators(array(
                       'NotEmpty',
                       array('date', false, array('HH:mm')),
-                      array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'))))
+                      array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')))))
                   ->setDecorators(array('ViewHelper'));
         $startTime->setAttrib('alt', 'time');
         $this->addElement($startTime);
@@ -43,7 +43,7 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
         $endDate = new Zend_Form_Element_Text('sb_date_end');
         $endDate->class = 'input_text';
         $endDate->setRequired(true)
-                ->setLabel('Date End:')
+                ->setLabel(_('Date End:'))
                 ->setValue(date("Y-m-d"))
                 ->setFilters(array('StringTrim'))
                 ->setValidators(array(
@@ -62,14 +62,14 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
                 ->setValidators(array(
                     'NotEmpty',
                     array('date', false, array('HH:mm')),
-                    array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => 'Invalid character entered'))))
+                    array('regex', false, array('/^[0-2]?[0-9]:[0-5][0-9]$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         $endTime->setAttrib('alt', 'time');
         $this->addElement($endTime);
 
         // add a select to choose a show.
         $showSelect = new Zend_Form_Element_Select("sb_show_filter");
-        $showSelect->setLabel("Show:");
+        $showSelect->setLabel(_("Show:"));
         $showSelect->setMultiOptions($this->getShowNames());
         $showSelect->setValue(null);
         $showSelect->setDecorators(array('ViewHelper'));
@@ -77,7 +77,7 @@ class Application_Form_ShowBuilder extends Zend_Form_SubForm
 
         if ($user->getType() === 'H') {
             $myShows = new Zend_Form_Element_Checkbox('sb_my_shows');
-            $myShows->setLabel('All My Shows:')
+            $myShows->setLabel(_('All My Shows:'))
                     ->setDecorators(array('ViewHelper'));
             $this->addElement($myShows);
         }
diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php
index e48fc7590..d4763f998 100644
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@@ -1,88 +1,119 @@
 <?php
 class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 {
-    private $criteriaOptions = array(
-            0              => "Select criteria",
-            "album_title"  => "Album",
-            "bit_rate"     => "Bit Rate (Kbps)",
-            "bpm"          => "BPM",
-            "composer"     => "Composer",
-            "conductor"    => "Conductor",
-            "copyright"    => "Copyright",
-            "artist_name"  => "Creator",
-            "encoded_by"   => "Encoded By",
-            "genre"        => "Genre",
-            "isrc_number"  => "ISRC",
-            "label"        => "Label",
-            "language"     => "Language",
-            "mtime"        => "Last Modified",
-            "lptime"       => "Last Played",
-            "length"       => "Length",
-            "mime"         => "Mime",
-            "mood"         => "Mood",
-            "owner_id"     => "Owner",
-            "replay_gain"  => "Replay Gain",
-            "sample_rate"  => "Sample Rate (kHz)",
-            "track_title"  => "Title",
-            "track_number" => "Track Number",
-            "utime"        => "Uploaded",
-            "info_url"     => "Website",
-            "year"         => "Year"
-    );
-
+    private $criteriaOptions;
+    private $stringCriteriaOptions;
+    private $numericCriteriaOptions;
+    private $limitOptions;
     private $criteriaTypes = array(
-            0              => "",
-            "album_title"  => "s",
-            "bit_rate"     => "n",
-            "bpm"          => "n",
-            "composer"     => "s",
-            "conductor"    => "s",
-            "copyright"    => "s",
-            "artist_name"  => "s",
-            "encoded_by"   => "s",
-            "utime"        => "n",
-            "mtime"        => "n",
-            "lptime"       => "n",
-            "genre"        => "s",
-            "isrc_number"  => "s",
-            "label"        => "s",
-            "language"     => "s",
-            "length"       => "n",
-            "mime"         => "s",
-            "mood"         => "s",
-            "owner_id"     => "s",
-            "replay_gain"  => "n",
-            "sample_rate"  => "n",
-            "track_title"  => "s",
-            "track_number" => "n",
-            "info_url"     => "s",
-            "year"         => "n"
+        0              => "",
+        "album_title"  => "s",
+        "bit_rate"     => "n",
+        "bpm"          => "n",
+        "composer"     => "s",
+        "conductor"    => "s",
+        "copyright"    => "s",
+        "artist_name"  => "s",
+        "encoded_by"   => "s",
+        "utime"        => "n",
+        "mtime"        => "n",
+        "lptime"       => "n",
+        "genre"        => "s",
+        "isrc_number"  => "s",
+        "label"        => "s",
+        "language"     => "s",
+        "length"       => "n",
+        "mime"         => "s",
+        "mood"         => "s",
+        "owner_id"     => "s",
+        "replay_gain"  => "n",
+        "sample_rate"  => "n",
+        "track_title"  => "s",
+        "track_number" => "n",
+        "info_url"     => "s",
+        "year"         => "n"
     );
+    
+    private function getCriteriaOptions($option = null)
+    {
+        if (!isset($this->criteriaOptions)) {
+            $this->criteriaOptions = array(
+                0              => _("Select criteria"),
+                "album_title"  => _("Album"),
+                "bit_rate"     => _("Bit Rate (Kbps)"),
+                "bpm"          => _("BPM"),
+                "composer"     => _("Composer"),
+                "conductor"    => _("Conductor"),
+                "copyright"    => _("Copyright"),
+                "artist_name"  => _("Creator"),
+                "encoded_by"   => _("Encoded By"),
+                "genre"        => _("Genre"),
+                "isrc_number"  => _("ISRC"),
+                "label"        => _("Label"),
+                "language"     => _("Language"),
+                "mtime"        => _("Last Modified"),
+                "lptime"       => _("Last Played"),
+                "length"       => _("Length"),
+                "mime"         => _("Mime"),
+                "mood"         => _("Mood"),
+                "owner_id"     => _("Owner"),
+                "replay_gain"  => _("Replay Gain"),
+                "sample_rate"  => _("Sample Rate (kHz)"),
+                "track_title"  => _("Title"),
+                "track_number" => _("Track Number"),
+                "utime"        => _("Uploaded"),
+                "info_url"     => _("Website"),
+                "year"         => _("Year")
+            );
+        }
+        
+        if (is_null($option)) return $this->criteriaOptions;
+        else return $this->criteriaOptions[$option];
+    }
 
-    private $stringCriteriaOptions = array(
-            "0"                => "Select modifier",
-            "contains"         => "contains",
-            "does not contain" => "does not contain",
-            "is"               => "is",
-            "is not"           => "is not",
-            "starts with"      => "starts with",
-            "ends with"        => "ends with"
-    );
+    private function getStringCriteriaOptions()
+    {
+        if (!isset($this->stringCriteriaOptions)) {
+            $this->stringCriteriaOptions = array(
+                "0"                => _("Select modifier"),
+                "contains"         => _("contains"),
+                "does not contain" => _("does not contain"),
+                "is"               => _("is"),
+                "is not"           => _("is not"),
+                "starts with"      => _("starts with"),
+                "ends with"        => _("ends with")
+            );
+        }
+        return $this->stringCriteriaOptions;
+    }
 
-    private $numericCriteriaOptions = array(
-            "0"               => "Select modifier",
-            "is"              => "is",
-            "is not"          => "is not",
-            "is greater than" => "is greater than",
-            "is less than"    => "is less than",
-            "is in the range" => "is in the range"
-    );
+    private function getNumericCriteriaOptions()
+    {
+        if (!isset($this->numericCriteriaOptions)) {
+            $this->numericCriteriaOptions = array(
+                "0"               => _("Select modifier"),
+                "is"              => _("is"),
+                "is not"          => _("is not"),
+                "is greater than" => _("is greater than"),
+                "is less than"    => _("is less than"),
+                "is in the range" => _("is in the range")
+            );
+        }
+        return $this->numericCriteriaOptions;
+    }
 
-    private $limitOptions = array(
-            "hours"   => "hours",
-            "minutes" => "minutes",
-            "items"   => "items"
-    );
+    private function getLimitOptions()
+    {
+        if (!isset($this->limitOptions)) {
+            $this->limitOptions = array(
+                "hours"   => _("hours"),
+                "minutes" => _("minutes"),
+                "items"   => _("items")
+            );
+        }
+        return $this->limitOptions;
+    }
+        
 
     public function init()
     {
@@ -99,11 +130,11 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         }
 
         $spType = new Zend_Form_Element_Radio('sp_type');
-        $spType->setLabel('Set smart block type:')
+        $spType->setLabel(_('Set smart block type:'))
                ->setDecorators(array('viewHelper'))
                ->setMultiOptions(array(
-                    'static' => 'Static',
-                    'dynamic' => 'Dynamic'
+                    'static' => _('Static'),
+                    'dynamic' => _('Dynamic')
                 ))
                ->setValue($blockType);
         $this->addElement($spType);
@@ -126,7 +157,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         if (isset($storedCrit["crit"])) {
             $criteriaKeys = array_keys($storedCrit["crit"]);
         }
-        $numElements = count($this->criteriaOptions);
+        $numElements = count($this->getCriteriaOptions());
         for ($i = 0; $i < $numElements; $i++) {
             $criteriaType = "";
 
@@ -153,7 +184,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                 $criteria->setAttrib('class', 'input_select sp_input_select'.$invisible)
                          ->setValue('Select criteria')
                          ->setDecorators(array('viewHelper'))
-                         ->setMultiOptions($this->criteriaOptions);
+                         ->setMultiOptions($this->getCriteriaOptions());
                 if ($i != 0 && !isset($criteriaKeys[$i])) {
                     $criteria->setAttrib('disabled', 'disabled');
                 }
@@ -174,13 +205,13 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                 }
                 if (isset($criteriaKeys[$i])) {
                     if ($criteriaType == "s") {
-                        $criteriaModifers->setMultiOptions($this->stringCriteriaOptions);
+                        $criteriaModifers->setMultiOptions($this->getStringCriteriaOptions());
                     } else {
-                        $criteriaModifers->setMultiOptions($this->numericCriteriaOptions);
+                        $criteriaModifers->setMultiOptions($this->getNumericCriteriaOptions());
                     }
                     $criteriaModifers->setValue($storedCrit["crit"][$criteriaKeys[$i]][$j]["modifier"]);
                 } else {
-                    $criteriaModifers->setMultiOptions(array('0' => 'Select modifier'));
+                    $criteriaModifers->setMultiOptions(array('0' => _('Select modifier')));
                 }
                 $this->addElement($criteriaModifers);
 
@@ -214,7 +245,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 
         $repeatTracks = new Zend_Form_Element_Checkbox('sp_repeat_tracks');
         $repeatTracks->setDecorators(array('viewHelper'))
-                     ->setLabel('Allow Repeat Tracks:');
+                     ->setLabel(_('Allow Repeat Tracks:'));
         if (isset($storedCrit["repeat_tracks"])) {
                 $repeatTracks->setChecked($storedCrit["repeat_tracks"]["value"] == 1?true:false);
         }
@@ -223,7 +254,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         $limit = new Zend_Form_Element_Select('sp_limit_options');
         $limit->setAttrib('class', 'sp_input_select')
               ->setDecorators(array('viewHelper'))
-              ->setMultiOptions($this->limitOptions);
+              ->setMultiOptions($this->getLimitOptions());
         if (isset($storedCrit["limit"])) {
             $limit->setValue($storedCrit["limit"]["modifier"]);
         }
@@ -231,7 +262,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         
         $limitValue = new Zend_Form_Element_Text('sp_limit_value');
         $limitValue->setAttrib('class', 'sp_input_text_limit')
-                   ->setLabel('Limit to')
+                   ->setLabel(_('Limit to'))
                    ->setDecorators(array('viewHelper'));
         $this->addElement($limitValue);
         if (isset($storedCrit["limit"])) {
@@ -253,23 +284,23 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 
         $generate = new Zend_Form_Element_Button('generate_button');
         $generate->setAttrib('class', 'btn btn-small');
-        $generate->setAttrib('title', 'Generate playlist content and save criteria');
+        $generate->setAttrib('title', _('Generate playlist content and save criteria'));
         $generate->setIgnore(true);
-        $generate->setLabel('Generate');
+        $generate->setLabel(_('Generate'));
         $generate->setDecorators(array('viewHelper'));
         $this->addElement($generate);
 
         $shuffle = new Zend_Form_Element_Button('shuffle_button');
         $shuffle->setAttrib('class', 'btn btn-small');
-        $shuffle->setAttrib('title', 'Shuffle playlist content');
+        $shuffle->setAttrib('title', _('Shuffle playlist content'));
         $shuffle->setIgnore(true);
-        $shuffle->setLabel('Shuffle');
+        $shuffle->setLabel(_('Shuffle'));
         $shuffle->setDecorators(array('viewHelper'));
         $this->addElement($shuffle);
 
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/smart-block-criteria.phtml', "openOption"=> $openSmartBlockOption,
-                        'criteriasLength' => count($this->criteriaOptions), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap,
+                        'criteriasLength' => count($this->getCriteriaOptions()), 'poolCount' => $files['count'], 'modRowMap' => $modRowMap,
                         'showPoolCount' => $showPoolCount))
         ));
     }
@@ -285,17 +316,17 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
             foreach ($d as $modKey=>$modInfo) {
                 if ($modKey == 0) {
                     $eleCrit = $this->getElement("sp_criteria_field_".$critKey."_".$modKey);
-                    $eleCrit->setValue($this->criteriaOptions[$modInfo['sp_criteria_field']]);
+                    $eleCrit->setValue($this->getCriteriaOptions($modInfo['sp_criteria_field']));
                     $eleCrit->setAttrib("disabled", null);
 
                     $eleMod = $this->getElement("sp_criteria_modifier_".$critKey."_".$modKey);
                     $criteriaType = $this->criteriaTypes[$modInfo['sp_criteria_field']];
                     if ($criteriaType == "s") {
-                        $eleMod->setMultiOptions($this->stringCriteriaOptions);
+                        $eleMod->setMultiOptions($this->getStringCriteriaOptions());
                     } elseif ($criteriaType == "n") {
-                        $eleMod->setMultiOptions($this->numericCriteriaOptions);
+                        $eleMod->setMultiOptions($this->getNumericCriteriaOptions());
                     } else {
-                        $eleMod->setMultiOptions(array('0' => 'Select modifier'));
+                        $eleMod->setMultiOptions(array('0' => _('Select modifier')));
                     }
                     $eleMod->setValue($modInfo['sp_criteria_modifier']);
                     $eleMod->setAttrib("disabled", null);
@@ -316,10 +347,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                     $criteria->setAttrib('class', 'input_select sp_input_select sp-invisible')
                     ->setValue('Select criteria')
                     ->setDecorators(array('viewHelper'))
-                    ->setMultiOptions($this->criteriaOptions);
+                    ->setMultiOptions($this->getCriteriaOptions());
 
                     $criteriaType = $this->criteriaTypes[$modInfo['sp_criteria_field']];
-                    $criteria->setValue($this->criteriaOptions[$modInfo['sp_criteria_field']]);
+                    $criteria->setValue($this->getCriteriaOptions($modInfo['sp_criteria_field']));
                     $this->addElement($criteria);
 
                     /****************** MODIFIER ***********/
@@ -329,11 +360,11 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                     ->setDecorators(array('viewHelper'));
 
                     if ($criteriaType == "s") {
-                        $criteriaModifers->setMultiOptions($this->stringCriteriaOptions);
+                        $criteriaModifers->setMultiOptions($this->getStringCriteriaOptions());
                     } elseif ($criteriaType == "n") {
-                        $criteriaModifers->setMultiOptions($this->numericCriteriaOptions);
+                        $criteriaModifers->setMultiOptions($this->getNumericCriteriaOptions());
                     } else {
-                        $criteriaModifers->setMultiOptions(array('0' => 'Select modifier'));
+                        $criteriaModifers->setMultiOptions(array('0' => _('Select modifier')));
                     }
                     $criteriaModifers->setValue($modInfo['sp_criteria_modifier']);
                     $this->addElement($criteriaModifers);
@@ -427,25 +458,25 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
         if ($data['etc']['sp_limit_options'] == 'hours' || $data['etc']['sp_limit_options'] == 'mins') {
             $element = $this->getElement("sp_limit_value");
             if ($data['etc']['sp_limit_value'] == "" || floatval($data['etc']['sp_limit_value']) <= 0) {
-                $element->addError("Limit cannot be empty or smaller than 0");
+                $element->addError(_("Limit cannot be empty or smaller than 0"));
                 $isValid = false;
             } else {
                 $mins = floatval($data['etc']['sp_limit_value']) * $multiplier;
                 if ($mins > 1440) {
-                    $element->addError("Limit cannot be more than 24 hrs");
+                    $element->addError(_("Limit cannot be more than 24 hrs"));
                     $isValid = false;
                 }
             }
         } else {
             $element = $this->getElement("sp_limit_value");
             if ($data['etc']['sp_limit_value'] == "" || floatval($data['etc']['sp_limit_value']) <= 0) {
-                $element->addError("Limit cannot be empty or smaller than 0");
+                $element->addError(_("Limit cannot be empty or smaller than 0"));
                 $isValid = false;
             } elseif (!ctype_digit($data['etc']['sp_limit_value'])) {
-                $element->addError("The value should be an integer");
+                $element->addError(_("The value should be an integer"));
                 $isValid = false;
             } elseif (intval($data['etc']['sp_limit_value']) > 500) {
-                $element->addError("500 is the max item limit value you can set");
+                $element->addError(_("500 is the max item limit value you can set"));
                 $isValid = false;
             }
         }
@@ -456,19 +487,19 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                     $element = $this->getElement("sp_criteria_field_".$rowKey."_".$key);
                     // check for not selected select box
                     if ($d['sp_criteria_field'] == "0" || $d['sp_criteria_modifier'] == "0") {
-                        $element->addError("You must select Criteria and Modifier");
+                        $element->addError(_("You must select Criteria and Modifier"));
                         $isValid = false;
                     } else {
                         $column = CcFilesPeer::getTableMap()->getColumnByPhpName($criteria2PeerMap[$d['sp_criteria_field']]);
                         // validation on type of column
                         if ($d['sp_criteria_field'] == 'length') {
                             if (!preg_match("/^(\d{2}):(\d{2}):(\d{2})/", $d['sp_criteria_value'])) {
-                                $element->addError("'Length' should be in '00:00:00' format");
+                                $element->addError(_("'Length' should be in '00:00:00' format"));
                                 $isValid = false;
                             }
                         } elseif ($column->getType() == PropelColumnTypes::TIMESTAMP) {
                             if (!preg_match("/(\d{4})-(\d{2})-(\d{2})/", $d['sp_criteria_value'])) {
-                                $element->addError("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00");
+                                $element->addError(_("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)"));
                                 $isValid = false;
                             } else {
                                 $result = Application_Common_DateHelper::checkDateTimeRangeForSQL($d['sp_criteria_value']);
@@ -481,7 +512,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
 
                             if (isset($d['sp_criteria_extra'])) {
                                 if (!preg_match("/(\d{4})-(\d{2})-(\d{2})/", $d['sp_criteria_extra'])) {
-                                    $element->addError("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00");
+                                    $element->addError(_("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)"));
                                     $isValid = false;
                                 } else {
                                     $result = Application_Common_DateHelper::checkDateTimeRangeForSQL($d['sp_criteria_extra']);
@@ -495,24 +526,24 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
                         } elseif ($column->getType() == PropelColumnTypes::INTEGER &&
                             $d['sp_criteria_field'] != 'owner_id') {
                             if (!is_numeric($d['sp_criteria_value'])) {
-                                $element->addError("The value has to be numeric");
+                                $element->addError(_("The value has to be numeric"));
                                 $isValid = false;
                             }
                             // length check
                             if (intval($d['sp_criteria_value']) >= pow(2,31)) {
-                                $element->addError("The value should be less then 2147483648");
+                                $element->addError(_("The value should be less then 2147483648"));
                                 $isValid = false;
                             }
                         } elseif ($column->getType() == PropelColumnTypes::VARCHAR) {
                             if (strlen($d['sp_criteria_value']) > $column->getSize()) {
-                                $element->addError("The value should be less ".$column->getSize()." characters");
+                                $element->addError(sprintf(_("The value should be less than %s characters"), $column->getSize()));
                                 $isValid = false;
                             }
                         }
                     }
 
                     if ($d['sp_criteria_value'] == "") {
-                        $element->addError("Value cannot be empty");
+                        $element->addError(_("Value cannot be empty"));
                         $isValid = false;
                     }
                 }//end foreach
diff --git a/airtime_mvc/application/forms/SoundcloudPreferences.php b/airtime_mvc/application/forms/SoundcloudPreferences.php
index d3840cbbf..02ba2b3b3 100644
--- a/airtime_mvc/application/forms/SoundcloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundcloudPreferences.php
@@ -13,7 +13,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         //enable soundcloud uploads
         $this->addElement('checkbox', 'UseSoundCloud', array(
-            'label'      => 'Automatically Upload Recorded Shows',
+            'label'      => _('Automatically Upload Recorded Shows'),
             'required'   => false,
             'value' => Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud(),
             'decorators' => array(
@@ -23,7 +23,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         //enable soundcloud uploads option
         $this->addElement('checkbox', 'UploadToSoundcloudOption', array(
-            'label'      => 'Enable SoundCloud Upload',
+            'label'      => _('Enable SoundCloud Upload'),
             'required'   => false,
             'value' => Application_Model_Preference::GetUploadToSoundcloudOption(),
             'decorators' => array(
@@ -33,7 +33,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
         //enable downloadable for soundcloud
         $this->addElement('checkbox', 'SoundCloudDownloadbleOption', array(
-            'label'      => 'Automatically Mark Files "Downloadable" on SoundCloud',
+            'label'      => _('Automatically Mark Files "Downloadable" on SoundCloud'),
             'required'   => false,
             'value' => Application_Model_Preference::GetSoundCloudDownloadbleOption(),
             'decorators' => array(
@@ -44,7 +44,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         //SoundCloud Username
         $this->addElement('text', 'SoundCloudUser', array(
             'class'      => 'input_text',
-            'label'      => 'SoundCloud Email',
+            'label'      => _('SoundCloud Email'),
             'filters'    => array('StringTrim'),
             'autocomplete' => 'off',
             'value' => Application_Model_Preference::GetSoundCloudUser(),
@@ -64,7 +64,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         //SoundCloud Password
         $this->addElement('password', 'SoundCloudPassword', array(
             'class'      => 'input_text',
-            'label'      => 'SoundCloud Password',
+            'label'      => _('SoundCloud Password'),
             'filters'    => array('StringTrim'),
             'autocomplete' => 'off',
             'value' => Application_Model_Preference::GetSoundCloudPassword(),
@@ -84,7 +84,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
 
          // Add the description element
         $this->addElement('textarea', 'SoundCloudTags', array(
-            'label'      => 'SoundCloud Tags: (separate tags with spaces)',
+            'label'      => _('SoundCloud Tags: (separate tags with spaces)'),
             'required'   => false,
             'class'      => 'input_text_area',
             'value' => Application_Model_Preference::GetSoundCloudTags(),
@@ -96,7 +96,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         //SoundCloud default genre
         $this->addElement('text', 'SoundCloudGenre', array(
             'class'      => 'input_text',
-            'label'      => 'Default Genre:',
+            'label'      => _('Default Genre:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => Application_Model_Preference::GetSoundCloudGenre(),
@@ -106,7 +106,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         ));
 
         $select = new Zend_Form_Element_Select('SoundCloudTrackType');
-        $select->setLabel('Default Track Type:');
+        $select->setLabel(_('Default Track Type:'));
         $select->setAttrib('class', 'input_select');
         $select->setMultiOptions(array(
                 "" => "",
@@ -130,7 +130,7 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
         $this->addElement($select);
 
         $select = new Zend_Form_Element_Select('SoundCloudLicense');
-        $select->setLabel('Default License:');
+        $select->setLabel(_('Default License:'));
         $select->setAttrib('class', 'input_select');
         $select->setMultiOptions(array(
                 "" => "",
diff --git a/airtime_mvc/application/forms/StreamSetting.php b/airtime_mvc/application/forms/StreamSetting.php
index c3443a3e0..1663cf127 100644
--- a/airtime_mvc/application/forms/StreamSetting.php
+++ b/airtime_mvc/application/forms/StreamSetting.php
@@ -19,7 +19,7 @@ class Application_Form_StreamSetting extends Zend_Form
         $setting = $this->setting;
         if (Application_Model_Preference::GetPlanLevel() == 'disabled') {
             $output_sound_device = new Zend_Form_Element_Checkbox('output_sound_device');
-            $output_sound_device->setLabel('Hardware Audio Output')
+            $output_sound_device->setLabel(_('Hardware Audio Output'))
                                 ->setRequired(false)
                                 ->setValue(($setting['output_sound_device'] == "true")?1:0)
                                 ->setDecorators(array('ViewHelper'));
@@ -30,7 +30,7 @@ class Application_Form_StreamSetting extends Zend_Form
 
             $output_types = array("ALSA"=>"ALSA", "AO"=>"AO", "OSS"=>"OSS", "Portaudio"=>"Portaudio", "Pulseaudio"=>"Pulseaudio");
             $output_type = new Zend_Form_Element_Select('output_sound_device_type');
-            $output_type->setLabel("Output Type")
+            $output_type->setLabel(_("Output Type"))
                     ->setMultiOptions($output_types)
                     ->setValue($setting['output_sound_device_type'])
                     ->setDecorators(array('ViewHelper'));
@@ -41,7 +41,7 @@ class Application_Form_StreamSetting extends Zend_Form
         }
 
         $icecast_vorbis_metadata = new Zend_Form_Element_Checkbox('icecast_vorbis_metadata');
-        $icecast_vorbis_metadata->setLabel('Icecast Vorbis Metadata')
+        $icecast_vorbis_metadata->setLabel(_('Icecast Vorbis Metadata'))
                                 ->setRequired(false)
                                 ->setValue(($setting['icecast_vorbis_metadata'] == "true")?1:0)
                                 ->setDecorators(array('ViewHelper'));
@@ -51,10 +51,10 @@ class Application_Form_StreamSetting extends Zend_Form
         $this->addElement($icecast_vorbis_metadata);
 
         $stream_format = new Zend_Form_Element_Radio('streamFormat');
-        $stream_format->setLabel('Stream Label:');
-        $stream_format->setMultiOptions(array("Artist - Title",
-                                            "Show - Artist - Title",
-                                            "Station name - Show name"));
+        $stream_format->setLabel(_('Stream Label:'));
+        $stream_format->setMultiOptions(array(_("Artist - Title"),
+                                            _("Show - Artist - Title"),
+                                            _("Station name - Show name")));
         $stream_format->setValue(Application_Model_Preference::GetStreamLabelFormat());
         $stream_format->setDecorators(array('ViewHelper'));
         $this->addElement($stream_format);
diff --git a/airtime_mvc/application/forms/StreamSettingSubForm.php b/airtime_mvc/application/forms/StreamSettingSubForm.php
index 6a243d12f..df61bb9ec 100644
--- a/airtime_mvc/application/forms/StreamSettingSubForm.php
+++ b/airtime_mvc/application/forms/StreamSettingSubForm.php
@@ -45,7 +45,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $disable_all = Application_Model_Preference::GetEnableStreamConf() == "false";
 
         $enable = new Zend_Form_Element_Checkbox('enable');
-        $enable->setLabel('Enabled:')
+        $enable->setLabel(_('Enabled:'))
                             ->setValue($setting[$prefix.'_enable'] == 'true' ? 1 : 0)
                             ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
@@ -54,7 +54,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($enable);
 
         $type = new Zend_Form_Element_Select('type');
-        $type->setLabel("Stream Type:")
+        $type->setLabel(_("Stream Type:"))
                 ->setMultiOptions($stream_types)
                 ->setValue(isset($setting[$prefix.'_type'])?$setting[$prefix.'_type']:0)
                 ->setDecorators(array('ViewHelper'));
@@ -64,7 +64,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($type);
 
         $bitrate = new Zend_Form_Element_Select('bitrate');
-        $bitrate->setLabel("Bit Rate:")
+        $bitrate->setLabel(_("Bit Rate:"))
                 ->setMultiOptions($stream_bitrates)
                 ->setValue(isset($setting[$prefix.'_bitrate'])?$setting[$prefix.'_bitrate']:0)
                 ->setDecorators(array('ViewHelper'));
@@ -74,7 +74,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($bitrate);
 
         $output = new Zend_Form_Element_Select('output');
-        $output->setLabel("Service Type:")
+        $output->setLabel(_("Service Type:"))
                 ->setMultiOptions(array("icecast"=>"Icecast", "shoutcast"=>"SHOUTcast"))
                 ->setValue(isset($setting[$prefix.'_output'])?$setting[$prefix.'_output']:"icecast")
                 ->setDecorators(array('ViewHelper'));
@@ -84,8 +84,8 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($output);
 
         $channels = new Zend_Form_Element_Select('channels');
-        $channels->setLabel("Channels:")
-                ->setMultiOptions(array("mono"=>"1 - Mono", "stereo"=>"2 - Stereo"))
+        $channels->setLabel(_("Channels:"))
+                ->setMultiOptions(array("mono"=>_("1 - Mono"), "stereo"=>_("2 - Stereo")))
                 ->setValue(isset($setting[$prefix.'_channels']) ? $setting[$prefix.'_channels'] : "stereo")
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
@@ -94,10 +94,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($channels);
 
         $host = new Zend_Form_Element_Text('host');
-        $host->setLabel("Server")
+        $host->setLabel(_("Server"))
                 ->setValue(isset($setting[$prefix.'_host'])?$setting[$prefix.'_host']:"")
                 ->setValidators(array(
-                        array('regex', false, array('/^[0-9a-zA-Z-_.]+$/', 'messages' => 'Invalid character entered'))))
+                        array('regex', false, array('/^[0-9a-zA-Z-_.]+$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $host->setAttrib("disabled", "disabled");
@@ -106,10 +106,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($host);
 
         $port = new Zend_Form_Element_Text('port');
-        $port->setLabel("Port")
+        $port->setLabel(_("Port"))
                 ->setValue(isset($setting[$prefix.'_port'])?$setting[$prefix.'_port']:"")
                 ->setValidators(array(new Zend_Validate_Between(array('min'=>0, 'max'=>99999))))
-                ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>'Only numbers are allowed.')))
+                ->addValidator('regex', false, array('pattern'=>'/^[0-9]+$/', 'messages'=>array('regexNotMatch'=>_('Only numbers are allowed.'))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $port->setAttrib("disabled", "disabled");
@@ -117,10 +117,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($port);
 
         $pass = new Zend_Form_Element_Text('pass');
-        $pass->setLabel("Password")
+        $pass->setLabel(_("Password"))
                 ->setValue(isset($setting[$prefix.'_pass'])?$setting[$prefix.'_pass']:"")
                 ->setValidators(array(
-                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $pass->setAttrib("disabled", "disabled");
@@ -129,7 +129,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($pass);
 
         $genre = new Zend_Form_Element_Text('genre');
-        $genre->setLabel("Genre")
+        $genre->setLabel(_("Genre"))
                 ->setValue(isset($setting[$prefix.'_genre'])?$setting[$prefix.'_genre']:"")
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
@@ -138,10 +138,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($genre);
 
         $url = new Zend_Form_Element_Text('url');
-        $url->setLabel("URL")
+        $url->setLabel(_("URL"))
                 ->setValue(isset($setting[$prefix.'_url'])?$setting[$prefix.'_url']:"")
                 ->setValidators(array(
-                        array('regex', false, array('/^[0-9a-zA-Z\-_.:\/]+$/', 'messages' => 'Invalid character entered'))))
+                        array('regex', false, array('/^[0-9a-zA-Z\-_.:\/]+$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $url->setAttrib("disabled", "disabled");
@@ -150,7 +150,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($url);
 
         $name = new Zend_Form_Element_Text('name');
-        $name->setLabel("Name")
+        $name->setLabel(_("Name"))
              ->setValue(isset($setting[$prefix.'_name'])?$setting[$prefix.'_name']:"")
              ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
@@ -159,7 +159,7 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($name);
 
         $description = new Zend_Form_Element_Text('description');
-        $description->setLabel("Description")
+        $description->setLabel(_("Description"))
                 ->setValue(isset($setting[$prefix.'_description'])?$setting[$prefix.'_description']:"")
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
@@ -168,10 +168,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($description);
 
         $mount = new Zend_Form_Element_Text('mount');
-        $mount->setLabel("Mount Point")
+        $mount->setLabel(_("Mount Point"))
                 ->setValue(isset($setting[$prefix.'_mount'])?$setting[$prefix.'_mount']:"")
                 ->setValidators(array(
-                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $mount->setAttrib("disabled", "disabled");
@@ -180,10 +180,10 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         $this->addElement($mount);
 
         $user = new Zend_Form_Element_Text('user');
-        $user->setLabel("Username")
+        $user->setLabel(_("Username"))
                 ->setValue(isset($setting[$prefix.'_user'])?$setting[$prefix.'_user']:"")
                 ->setValidators(array(
-                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => 'Invalid character entered'))))
+                        array('regex', false, array('/^[^ &<>]+$/', 'messages' => _('Invalid character entered')))))
                 ->setDecorators(array('ViewHelper'));
         if ($disable_all) {
             $user->setAttrib("disabled", "disabled");
@@ -205,18 +205,18 @@ class Application_Form_StreamSettingSubForm extends Zend_Form_SubForm
         if ($f_data['enable'] == 1) {
             if ($f_data['host'] == '') {
                 $element = $this->getElement("host");
-                $element->addError("Server cannot be empty.");
+                $element->addError(_("Server cannot be empty."));
                 $isValid = false;
             }
             if ($f_data['port'] == '') {
                 $element = $this->getElement("port");
-                $element->addError("Port cannot be empty.");
+                $element->addError(_("Port cannot be empty."));
                 $isValid = false;
             }
             if ($f_data['output'] == 'icecast') {
                 if ($f_data['mount'] == '') {
                     $element = $this->getElement("mount");
-                    $element->addError("Mount cannot be empty with Icecast server.");
+                    $element->addError(_("Mount cannot be empty with Icecast server."));
                     $isValid = false;
                 }
             }
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index 99aae55ad..ecad67bb3 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -17,7 +17,7 @@ class Application_Form_SupportSettings extends Zend_Form
         //Station name
         $this->addElement('text', 'stationName', array(
             'class'      => 'input_text',
-            'label'      => 'Station Name',
+            'label'      => _('Station Name'),
             'required'   => true,
             'filters'    => array('StringTrim'),
             'validator'  => array('NotEmpty'),
@@ -30,7 +30,7 @@ class Application_Form_SupportSettings extends Zend_Form
         // Phone number
         $this->addElement('text', 'Phone', array(
             'class'      => 'input_text',
-            'label'      => 'Phone:',
+            'label'      => _('Phone:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => Application_Model_Preference::GetPhone(),
@@ -42,7 +42,7 @@ class Application_Form_SupportSettings extends Zend_Form
         //Email
         $this->addElement('text', 'Email', array(
             'class'      => 'input_text',
-            'label'      => 'Email:',
+            'label'      => _('Email:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => Application_Model_Preference::GetEmail(),
@@ -53,7 +53,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
          // Station Web Site
         $this->addElement('text', 'StationWebSite', array(
-            'label'      => 'Station Web Site:',
+            'label'      => _('Station Web Site:'),
             'required'   => false,
             'class'      => 'input_text',
             'value' => Application_Model_Preference::GetStationWebSite(),
@@ -64,7 +64,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
         // county list dropdown
         $this->addElement('select', 'Country', array(
-            'label'        => 'Country:',
+            'label'        => _('Country:'),
             'required'    => false,
             'value'        => Application_Model_Preference::GetStationCountry(),
             'multiOptions'    => $country_list,
@@ -75,7 +75,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
         // Station city
         $this->addElement('text', 'City', array(
-            'label'      => 'City:',
+            'label'      => _('City:'),
             'required'   => false,
             'class'      => 'input_text',
             'value' => Application_Model_Preference::GetStationCity(),
@@ -87,7 +87,7 @@ class Application_Form_SupportSettings extends Zend_Form
         // Station Description
         $description = new Zend_Form_Element_Textarea('Description');
         $description->class = 'input_text_area';
-        $description->setLabel('Station Description:')
+        $description->setLabel(_('Station Description:'))
                     ->setRequired(false)
                     ->setValue(Application_Model_Preference::GetStationDescription())
                     ->setDecorators(array('ViewHelper'))
@@ -97,7 +97,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
         // Station Logo
         $upload = new Zend_Form_Element_File('Logo');
-        $upload->setLabel('Station Logo:')
+        $upload->setLabel(_('Station Logo:'))
                 ->setRequired(false)
                 ->setDecorators(array('File'))
                 ->addValidator('Count', false, 1)
@@ -108,7 +108,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
             //enable support feedback
             $this->addElement('checkbox', 'SupportFeedback', array(
-                'label'      => 'Send support feedback',
+                'label'      => _('Send support feedback'),
                 'required'   => false,
                 'value' => Application_Model_Preference::GetSupportFeedback(),
                 'decorators' => array(
@@ -118,7 +118,7 @@ class Application_Form_SupportSettings extends Zend_Form
 
             // checkbox for publicise
             $checkboxPublicise = new Zend_Form_Element_Checkbox("Publicise");
-            $checkboxPublicise->setLabel('Promote my station on Sourcefabric.org')
+            $checkboxPublicise->setLabel(_('Promote my station on Sourcefabric.org'))
                               ->setRequired(false)
                               ->setDecorators(array('ViewHelper'))
                               ->setValue(Application_Model_Preference::GetPublicise());
@@ -143,7 +143,10 @@ class Application_Form_SupportSettings extends Zend_Form
 
             // checkbox for privacy policy
             $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
-            $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.")
+            $checkboxPrivacy->setLabel(
+                sprintf(_("By checking this box, I agree to Sourcefabric's %sprivacy policy%s."),
+                    "<a id='link_to_privacy' href='http://www.sourcefabric.org/en/about/policy/' onclick='window.open(this.href); return false;'>",
+                    "</a>"))
                 ->setDecorators(array('ViewHelper'));
             $this->addElement($checkboxPrivacy);
 
@@ -151,7 +154,7 @@ class Application_Form_SupportSettings extends Zend_Form
         $submit = new Zend_Form_Element_Submit("submit");
         $submit->class = 'ui-button ui-state-default right-floated';
         $submit->setIgnore(true)
-                ->setLabel("Save")
+                ->setLabel(_("Save"))
                 ->setDecorators(array('ViewHelper'));
         $this->addElement($submit);
     }
@@ -166,7 +169,7 @@ class Application_Form_SupportSettings extends Zend_Form
             if (isset($data["Privacy"])) {
                 $checkPrivacy = $this->getElement('Privacy');
                 if ($data["SupportFeedback"] == "1" && $data["Privacy"] != "1") {
-                    $checkPrivacy->addError("You have to agree to privacy policy.");
+                    $checkPrivacy->addError(_("You have to agree to privacy policy."));
                     $isValid = false;
                 }
             }
diff --git a/airtime_mvc/application/forms/WatchedDirPreferences.php b/airtime_mvc/application/forms/WatchedDirPreferences.php
index 7fcf00893..7c4fca1c8 100644
--- a/airtime_mvc/application/forms/WatchedDirPreferences.php
+++ b/airtime_mvc/application/forms/WatchedDirPreferences.php
@@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'storageFolder', array(
             'class'      => 'input_text',
-            'label'      => 'Import Folder:',
+            'label'      => _('Import Folder:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => '',
@@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'watchedFolder', array(
             'class'      => 'input_text',
-            'label'      => 'Watched Folders:',
+            'label'      => _('Watched Folders:'),
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => '',
@@ -37,7 +37,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
         $element = $this->getElement($p_form_element_id);
 
         if (!is_dir($element->getValue())) {
-            $element->setErrors(array('Not a valid Directory'));
+            $element->setErrors(array(_('Not a valid Directory')));
 
             return false;
         } else {
diff --git a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
index c1d6d7d4a..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("AirtimeRecorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
index 490182ce8..e8196913f 100644
--- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
+++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml
@@ -42,7 +42,7 @@
                 </div>
                 <div class="jp-time-holder">
                     <div class="jp-current-time"></div>
-<?php if ($this->type == "audioclip"): ?><div class="jp-duration"></div><? echo _(" "); ?><?php endif;?>
+<?php if ($this->type == "audioclip"): ?><div class="jp-duration"></div><?php endif;?>
                 </div>
             </div>
             <div class="jp-volume-block">
@@ -67,7 +67,9 @@
         </div>
         <div class="jp-no-solution">
             <span><? echo _("Update Required") ?></span>
-            To play the media you will need to either update your browser to a recent version or update your <a href="http://get.adobe.com/flashplayer/" target="_blank"><? echo _("Flash plugin") ?></a>.
+            <? sprintf(_("To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."),
+                "<a href='http://get.adobe.com/flashplayer/' target='_blank'>",
+                "</a>") ?>
         </div>
     </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml
index 12f355d4f..a844ec398 100644
--- a/airtime_mvc/application/views/scripts/dashboard/about.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml
@@ -1,8 +1,21 @@
 <div class="text-content">
     <h2><? echo _("About") ?></h2>
 <p>
-<a href="http://airtime.sourcefabric.org" target="_blank"><? echo _("Airtime") ?></a><? echo _(" "); ?><?php echo $this->airtime_version ?><? echo _(", the open radio software for scheduling and remote station management."); ?><br>
-© 2012 <a href="http://www.sourcefabric.org" target="_blank"><? echo _("Sourcefabric") ?></a><? echo _(" o.p.s. Airtime is distributed under the "); ?><a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank">GNU GPL v.3</a>
+<?php 
+echo sprintf(_("%sAirtime%s %s, , the open radio software for scheduling and remote station management. %s"),
+    "<a href='http://airtime.sourcefabric.org' target='_blank'>",
+    "</a>",
+     $this->airtime_version,
+    "<br />")
+?>
+<br>© 2012 
+<?php 
+echo sprintf(_("%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"),
+    "<a href='http://www.sourcefabric.org' target='_blank'>",
+    "</a>",
+    "<a href='http://www.gnu.org/licenses/gpl-3.0-standalone.html' target='_blank'>",
+    "</a>")
+?>
 </p>
 </div>
 <br>
diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml
index ffa080e47..66857c7cd 100644
--- a/airtime_mvc/application/views/scripts/dashboard/help.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml
@@ -1,15 +1,17 @@
 <div class="gray-logo"></div>
 <div class="text-content">
-  <h2>Welcome to Airtime!</h2>
-<p>Here's how you can get started using Airtime to automate your broadcasts: </p>
+  <h2><?php echo _("Welcome to Airtime!") ?></h2>
+<p><?php echo _("Here's how you can get started using Airtime to automate your broadcasts: ")?></p>
 
 <ol>
-    <li>Begin by adding your files to the library using the "Add Media" menu button. You can drag and drop your files to this window too.</li>
-    <li>Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.</li>
-    <li>Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add / Remove Content".</li>
-    <li><? echo _("Select your media from the left pane and drag them to your show in the right pane."); ?></li>
+    <li><?php echo _("Begin by adding your files to the library using the 'Add Media' menu button. You can drag and drop your files to this window too.")?></li>
+    <li><?php echo _("Create a show by going to 'Calendar' in the menu bar, and then clicking the '+ Show' icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.")?></li>
+    <li><?php echo _("Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting 'Add / Remove Content'")?>.</li>
+    <li><?php echo _("Select your media from the left pane and drag them to your show in the right pane."); ?></li>
 </ol>
-<p><strong>Then you're good to go!</strong><br />
-For more detailed help, read the <a href="http://www.sourcefabric.org/en/airtime/manuals/" target="_blank"><? echo _("user manual") ?></a><? echo _("."); ?></p>
+<p><strong><?php echo _("Then you're good to go!")?></strong><br />
+<?php echo sprintf(_("For more detailed help, read the %suser manual%s."),
+    "<a href='http://www.sourcefabric.org/en/airtime/manuals/' target='_blank'>",
+    "</a>") ?></p>
 </div>
 
diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml
index 4b4a74137..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/dashboard/index.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Dashboard") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/error/denied.phtml b/airtime_mvc/application/views/scripts/error/denied.phtml
index 6217eb227..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/error/denied.phtml
+++ b/airtime_mvc/application/views/scripts/error/denied.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Error") ?></b><? echo _(" and script/action name "); ?><b><? echo _("denied"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/error/error.phtml b/airtime_mvc/application/views/scripts/error/error.phtml
index a58862e11..07326ad50 100644
--- a/airtime_mvc/application/views/scripts/error/error.phtml
+++ b/airtime_mvc/application/views/scripts/error/error.phtml
@@ -7,8 +7,8 @@
 </head>
 <body>
     <div class="error-content">
-        <h2>Page not found!</h2>
-        <p>Looks like the page you were looking for doesn't exist!</p>
+        <h2><?php echo _("Page not found!")?></h2>
+        <p><?php echo _("Looks like the page you were looking for doesn't exist!")?></p>
         <div class="button-bar">
             <a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><? echo _("Help") ?></a>
         </div>
diff --git a/airtime_mvc/application/views/scripts/form/daterange.phtml b/airtime_mvc/application/views/scripts/form/daterange.phtml
index 3d3f4bb63..b3435e284 100644
--- a/airtime_mvc/application/views/scripts/form/daterange.phtml
+++ b/airtime_mvc/application/views/scripts/form/daterange.phtml
@@ -3,7 +3,7 @@
     <?php echo $this->element->getElement('his_time_start') ?>
     <?php echo $this->element->getElement('his_date_end') ?>
     <?php echo $this->element->getElement('his_time_end') ?>
-    <div id="his_submit" class="ui-button ui-state-default" title="Filter History">
+    <div id="his_submit" class="ui-button ui-state-default" title="<?php echo _("Filter History")?>">
         <span class="ui-icon ui-icon-search"></span>
     </div>
 </div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
index 46c394ce3..e21347cb3 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
@@ -105,7 +105,8 @@
                 <?php endif; ?> 
             </dd>
         <dt id="master_dj_connection_url-label">
-            <label class="optional" for="master_dj_connection_url" style="white-space: nowrap">Master Source Connection URL:
+            <label class="optional" for="master_dj_connection_url" style="white-space: nowrap">
+                <?php echo _("Master Source Connection URL:")?>
             </label>
         </dt>
         <dd id="master_dj_connection_url-element">
@@ -148,7 +149,8 @@
                 <?php endif; ?> 
             </dd>
         <dt id="live_dj_connection_url-label">
-            <label class="optional" for="live_dj_connection_url" style="white-space: nowrap">Show Source Connection URL:
+            <label class="optional" for="live_dj_connection_url" style="white-space: nowrap">
+                <?php echo _("Show Source Connection URL:")?>
             </label>
         </dt>
         <dd id="live_dj_connection_url-element">
diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
index 20bcc92c9..30efe4b0b 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml
@@ -41,7 +41,7 @@
         </dd>
         <dt id="SoundCloudUser-label" class="block-display">
             <label class="optional" for="SoundCloudUser"><?php echo $this->element->getElement('SoundCloudUser')->getLabel() ?>
-                <span class="info-text-small">(Required)</span> :
+                <span class="info-text-small"><?php echo _("(Required)")?></span> :
             </label>
         </dt>
         <dd id="SoundCloudUser-element" class="block-display">
@@ -56,7 +56,7 @@
         </dd>
         <dt id="SoundCloudPassword-label" class="block-display">
             <label class="optional" for="SoundCloudPassword"><?php echo $this->element->getElement('SoundCloudPassword')->getLabel() ?>
-                <span class="info-text-small">(Required)</span> :
+                <span class="info-text-small"><?php echo _("(Required)")?></span> :
             </label>
         </dt>
         <dd id="SoundCloudPassword-element" class="block-display">
diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
index bbbda42d6..234047161 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -40,8 +40,8 @@
             <?php foreach($watched_dirs as $watched_dir): ?>
                 <dd class="block-display selected-item">
                     <?php echo ($watched_dir->getExistsFlag())?"":"<span class='ui-icon-alert'><img src='/css/images/warning-icon.png'></span>"?><span id="folderPath" style="display:block; width:350px"><?php echo $watched_dir->getDirectory();?></span></span>
-                    <span title="Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)" class="ui-icon ui-icon-refresh"></span>
-                    <span title="Remove watched directory" class="ui-icon ui-icon-close"></span>
+                    <span title="<?php echo _("Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)")?> class="ui-icon ui-icon-refresh"></span>
+                    <span title="<?php echo _("Remove watched directory")?>" class="ui-icon ui-icon-close"></span>
                     
                 </dd>
             <?php endforeach; ?>
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index 287cc4fc2..a6ee40f6d 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -3,11 +3,10 @@
         <fieldset>
             <dl class="zend_form">
                <dt class="block-display info-text">
-                    Help Airtime improve by letting us know how you are using it. This info
-                    will be collected regularly in order to enhance your user experience.
-                    <br /><br />
-                    Click "Yes, help Airtime" and we'll make sure the features you use are
-                    constantly improving.
+                    <?php echo sprintf(_("Help Airtime improve by letting us know how you are using it. This info "
+                    ."will be collected regularly in order to enhance your user experience.%s"
+                    ."Click 'Yes, help Airtime' and we'll make sure the features you use are"
+                    ."constantly improving."), "<br /><br />") ?>
                 </dt>
                 <dd id="SupportFeedback-element" class="block-display">
                     <label class="optional" for="SupportFeedback">
@@ -23,9 +22,10 @@
                     <?php endif; ?>
                 </dd>
                 <dt class="block-display info-text">
-                    Click the box below to advertise your station on 
-                    <a id="link_to_whos_using" href="http://sourcefabric.org/en/airtime/whosusing" onclick="window.open(this.href); return false"><? echo _("Sourcefabric.org"); ?></a>. 
-                    In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
+                    <?php echo sprintf(_("Click the box below to advertise your station on %sSourcefabric.org%s."
+                        ." In order to promote your station, 'Send support feedback' must be enabled. This data will be collected in addition to the support feedback."),
+                        "<a id='link_to_whos_using' href='http://sourcefabric.org/en/airtime/whosusing' onclick='window.open(this.href); return false'>",
+                        "</a>")?>
                 </dt>
                 <dd id="publicize-element" class="block-display">
                     <label class="optional" for="Publicise">
@@ -44,7 +44,7 @@
             <dl id="public-info" style="display:none;">
                 <dt id="stnName-label">
                     <label class="optional" for="stnName"><?php echo $this->element->getElement('stnName')->getLabel() ?>
-                        <span class="info-text-small">(Required)</span> :
+                        <span class="info-text-small"><?php echo _("(Required)")?></span> :
                     </label>
                 </dt>
                 <dd id="stnName-element">
@@ -62,7 +62,7 @@
                 </dt>
                 <dd id="Phone-element">
                     <?php echo $this->element->getElement('Phone') ?>
-                    <span class="info-text-small">(for verification purposes only, will not be published)</span>
+                    <span class="info-text-small"><?php echo _("(for verification purposes only, will not be published)")?></span>
                     <?php if($this->element->getElement('Phone')->hasErrors()) : ?>
                         <ul class='errors'>
                             <?php foreach($this->element->getElement('Phone')->getMessages() as $error): ?>
@@ -76,7 +76,7 @@
                 </dt>
                 <dd id="Email-element">
                     <?php echo $this->element->getElement('Email') ?>
-                    <span class="info-text-small">(for verification purposes only, will not be published)</span>
+                    <span class="info-text-small"><?php echo _("(for verification purposes only, will not be published)")?></span>
                     <?php if($this->element->getElement('Email')->hasErrors()) : ?>
                         <ul class='errors'>
                             <?php foreach($this->element->getElement('Email')->getMessages() as $error): ?>
@@ -147,7 +147,7 @@
                     <?php }?>
                     
                     <?php echo $this->element->getElement('Logo') ?>
-                    <p class="info-text">Note: Anything larger than 600x600 will be resized.</p>
+                    <p class="info-text"><?php echo _("Note: Anything larger than 600x600 will be resized.")?></p>
                     <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
                         <ul class='errors'>
                             <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index 49d482d69..c4c344e10 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -9,7 +9,7 @@
     <fieldset class="padded display_field push-down-8 closed">
         <legend style="cursor: pointer;">
         	<span class="ui-icon ui-icon-triangle-2-n-s"></span>
-        Filter By Show:
+        <?php echo _("Filter By Show:")?>"
         </legend>
 
         <div class="sb-options-form">
diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index f44080b8e..7b6ccf0fd 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -117,20 +117,20 @@
                 if ($this->poolCount > 1) {
                     echo $this->poolCount;
                 ?>
-                    files meet the criteria
+                    <?php echo _("files meet the criteria")?>
                     </span>
                     <span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
                 <?php
                 } else if ($this->poolCount == 1) {
                     echo $this->poolCount;
                 ?>
-                    file meets the criteria
+                    <?php echo _("file meet the criteria")?>
                     </span>
                     <span class='checked-icon sp-checked-icon' id='sp_pool_count_icon'></span>
                 <?php
                 } else {
                 ?>
-                    0 files meet the criteria
+                    0 <?php echo _(" files meet the criteria")?>
                     </span>
                     <span class='sp-warning-icon' id='sp_pool_count_icon'></span>
                 <?php
diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
index 29df7aaa2..ec3505ccc 100644
--- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
+++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml
@@ -29,7 +29,8 @@
                 <?php echo $this->element->getElement('bitrate')?>
             </dd>
             <dt id="outputServer-label">
-                <label for="outputServer"><?php echo $this->element->getElement('host')->getLabel()?><span class="info-text-small">(Required)</span> :</label>
+                <label for="outputServer"><?php echo $this->element->getElement('host')->getLabel()?><span class="info-text-small">
+                <?php echo _("(Required)")?></span> :</label>
             </dt>
             <dd id="outputServer-element">
                 <?php echo $this->element->getElement('host')?>
@@ -42,7 +43,8 @@
                 <?php endif; ?>
             </dd>
             <dt id="outputPort-label">
-                <label for="outputPort"><?php echo $this->element->getElement('port')->getLabel()?><span class="info-text-small">(Required)</span> :</label>
+                <label for="outputPort"><?php echo $this->element->getElement('port')->getLabel()?><span class="info-text-small">
+                <?php echo _("(Required)")?></span> :</label>
             </dt>
             <dd id="outputPort-element">
                 <?php echo $this->element->getElement('port')?>
@@ -71,7 +73,7 @@
             <fieldset class="padded top-margin display_field toggle closed" id="output_setting">
                 <legend style="cursor: pointer;">
                     <span class="ui-icon ui-icon-triangle-2-n-s"></span>
-                    Additional Options
+                    <?php echo _("Additional Options")?>
                 </legend>
                 <dl class="zend_form">
                 <dt id="outputUser-label">
@@ -103,7 +105,7 @@
                     <?php endif; ?>
                 </dd>
                 <dt class="block-display info-block">
-                    The following info will be displayed to listeners in their media player:
+                    <?php echo _("The following info will be displayed to listeners in their media player:")?>
                 </dt>
                 <dt id="stationName-label">
                     <label for="stationName"><?php echo $this->element->getElement('name')->getLabel()?> :</label>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index e4f6b535c..6a268ec61 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -2,10 +2,9 @@
     <dl class="zend_form">
         <dd id="SupportFeedback-element" style="width:90%;">
             <div class="info-text">
-                Help Airtime improve by letting Sourcefabric know how you are using it. This information
-                will be collected regularly in order to enhance your user experience.<br />
-                Click the "Send support feedback" box and we'll make sure the features you use are
-                constantly improving.
+               <?php echo sprintf(_("Help Airtime improve by letting Sourcefabric know how you are using it. This information"
+                ." will be collected regularly in order to enhance your user experience.%s"
+                ."Click the 'Send support feedback' box and we'll make sure the features you use are constantly improving."), "<br />")?>
             </div>
             <label class="optional" for="SupportFeedback">
                 <?php echo $this->element->getElement('SupportFeedback') ?>
@@ -20,8 +19,10 @@
             <?php endif; ?> 
         </dd>
         <dd id="publicize-element" style="width:90%;">
-            <div class="info-text">Click the box below to promote your station on 
-            <a id="link_to_whos_using" href="http://www.sourcefabric.org/en/airtime/whosusing/" onclick="window.open(this.href); return false"><? echo _("Sourcefabric.org"); ?></a>.
+            <div class="info-text">
+                <?php echo sprintf(_("Click the box below to promote your station on %sSourcefabric.org%s."), 
+                    "<a id='link_to_whos_using' href='http://www.sourcefabric.org/en/airtime/whosusing/' onclick='window.open(this.href); return false'>",
+                    "</a>")?>
             </div>
             <label class="optional" for="Publicise">
                 <?php echo $this->element->getElement('Publicise') ?>
@@ -36,7 +37,9 @@
             <?php endif; ?> 
         </dd>
     </dl>
-    <div class="info-text" style="clear: both;padding: 4px 0 4px 15px;">(In order to promote your station, "Send support feedback" must be enabled).<br /><br /></div>
+    <div class="info-text" style="clear: both;padding: 4px 0 4px 15px;">
+        <?php echo _("(In order to promote your station, 'Send support feedback' must be enabled).")?><br /><br />
+    </div>
     <dl id="public-info" style="display:<?php echo "none"?>;">
         <dt id="stationName-label" class="block-display">
             <label class="required" for="stationName"><?php echo $this->element->getElement('stationName')->getLabel() ?>
@@ -69,7 +72,9 @@
         </dd>
         <dt id="Email-label" class="block-display">
             <label class="optional" for="Email"><?php echo $this->element->getElement('Email')->getLabel() ?></label>
-            <span class="info-text-small">(for verification purposes only, will not be published)</span>
+            <span class="info-text-small">
+                <?php echo _("(for verification purposes only, will not be published)")?>
+            </span>
         </dt>
         <dd id="Email-element" class="block-display">
             <?php echo $this->element->getElement('Email') ?>
@@ -142,7 +147,9 @@
             <?php }?>
             
             <?php echo $this->element->getElement('Logo') ?>
-            <div class="info-text"><p>Note: Anything larger than 600x600 will be resized.</p></div>
+            <div class="info-text">
+                <p><?php echo ("Note: Anything larger than 600x600 will be resized.")?></p>
+            </div>
             <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
                 <ul class='errors'>
                     <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
diff --git a/airtime_mvc/application/views/scripts/index/display.phtml b/airtime_mvc/application/views/scripts/index/display.phtml
index 02beeaa17..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/index/display.phtml
+++ b/airtime_mvc/application/views/scripts/index/display.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("display"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/index/main.phtml b/airtime_mvc/application/views/scripts/index/main.phtml
index 5c6d8706e..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/index/main.phtml
+++ b/airtime_mvc/application/views/scripts/index/main.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("main"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/index/newfield.phtml b/airtime_mvc/application/views/scripts/index/newfield.phtml
index 35649e60f..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/index/newfield.phtml
+++ b/airtime_mvc/application/views/scripts/index/newfield.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Index") ?></b><? echo _(" and script/action name "); ?><b><? echo _("newfield"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
index 74e37b23a..0ab387ca1 100644
--- a/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
+++ b/airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml
@@ -18,7 +18,7 @@
 <tr><td><? echo _("Isrc Number:"); ?></td><td><?php echo ($this->md["MDATA_KEY_ISRC"]);?></td></tr>
 <tr><td><? echo _("Website:"); ?></td><td><?php echo ($this->md["MDATA_KEY_URL"]);?></td></tr>
 <tr><td><? echo _("Language:"); ?></td><td><?php echo ($this->md["MDATA_KEY_LANGUAGE"]);?></td></tr>
-<tr><td>File&nbsp;Path:</td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr>
+<tr><td><? echo _("File"); ?>&nbsp;<? echo _("Path:"); ?></td><td><?php echo ($this->md["MDATA_KEY_FILEPATH"]);?></td></tr>
 </table>
 <?php endif; ?>
 
@@ -36,10 +36,10 @@
 
 <?php if ($this->type == "playlist") { ?>
 <div class='file-md-qtip-legend'>
-<span class='webstream'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Web Stream"); ?></span><br />
-<span class='dynamic'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Dynamic Smart Block"); ?></span><br />
-<span class='static'><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Static Smart Block"); ?></span><br />
-<span><? echo _("o") ?></span><? echo _(" "); ?><span><? echo _("Audio Track"); ?></span>
+<span class='webstream'>o</span> <span><? echo _("Web Stream"); ?></span><br />
+<span class='dynamic'>o</span> <span><? echo _("Dynamic Smart Block"); ?></span><br />
+<span class='static'>o</span> <span><? echo _("Static Smart Block"); ?></span><br />
+<span>o</span> <span><? echo _("Audio Track"); ?></span>
 </div>
 <?php } ?>
 
@@ -116,7 +116,7 @@
         <?php endforeach; ?>
             <tr>
                 <td><? echo _("Limit to ") ?></td>
-                <td><?php echo $this->contents["limit"]["value"] ?><? echo _(" "); ?><?php echo $this->contents["limit"]["modifier"] ?></td>
+                <td><?php echo $this->contents["limit"]["value"] ?> <?php echo $this->contents["limit"]["modifier"] ?></td>
             </tr>
         </table>
     <?php } ?>
diff --git a/airtime_mvc/application/views/scripts/listenerstat/index.phtml b/airtime_mvc/application/views/scripts/listenerstat/index.phtml
index 9f3568869..466c34fa6 100644
--- a/airtime_mvc/application/views/scripts/listenerstat/index.phtml
+++ b/airtime_mvc/application/views/scripts/listenerstat/index.phtml
@@ -1,5 +1,5 @@
 <div id="listenerstat_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
-    Listener Count Over Time<br>
+    <?php echo _("Listener Count Over Time")?><br>
     <div id="flot_placeholder" style="width:600px;height:300px;margin:0px 50px 0px 50px"></div>
     <div id="legend" style="width:600px;height:70px;margin:0px 50px 0px 50px"></div>
     <?php echo $this->date_form; ?>
diff --git a/airtime_mvc/application/views/scripts/login/index.phtml b/airtime_mvc/application/views/scripts/login/index.phtml
index dbd598058..524afee90 100644
--- a/airtime_mvc/application/views/scripts/login/index.phtml
+++ b/airtime_mvc/application/views/scripts/login/index.phtml
@@ -3,7 +3,9 @@
         <h2><? echo _("Login") ?></h2>
     <div id="login" class="login-content clearfix">
         <?php if(isset($this->demo) && $this->demo == 1){?>
-            <p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
+            <p style="font-weight:bold">
+            <?php echo _("Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.")?>            
+            </p>
         <?php }?>
         <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
         <?php echo $this->form; ?>
diff --git a/airtime_mvc/application/views/scripts/login/logout.phtml b/airtime_mvc/application/views/scripts/login/logout.phtml
index fb1ab43f0..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/login/logout.phtml
+++ b/airtime_mvc/application/views/scripts/login/logout.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Login") ?></b><? echo _(" and script/action name "); ?><b><? echo _("logout"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/login/password-restore.phtml b/airtime_mvc/application/views/scripts/login/password-restore.phtml
index 53385c636..6e92d1cfc 100644
--- a/airtime_mvc/application/views/scripts/login/password-restore.phtml
+++ b/airtime_mvc/application/views/scripts/login/password-restore.phtml
@@ -3,7 +3,9 @@
   <h2><? echo _("Reset password") ?></h2>
   
   <div id="login" class="login-content clearfix">
-    <p class="light">Please enter your account e-mail address. You will receive a link to create a new password via e-mail.</p>
+    <p class="light">
+        <?php echo _("Please enter your account e-mail address. You will receive a link to create a new password via e-mail.")?>
+    </p>
     <?php echo $this->form; ?>
   </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/partialviews/header.phtml b/airtime_mvc/application/views/scripts/partialviews/header.phtml
index e2fd0e871..e43dbc262 100644
--- a/airtime_mvc/application/views/scripts/partialviews/header.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/header.phtml
@@ -1,13 +1,13 @@
 <div id="master-panel">
   <div class="now-playing-block">
-    <div class="text-row"><strong><? echo _("Previous:"); ?></strong><? echo _(" "); ?><span id='previous'></span><? echo _(" "); ?><span id='prev-length'></span></div>
+    <div class="text-row"><strong><? echo _("Previous:"); ?></strong> <span id='previous'></span> <span id='prev-length'></span></div>
     <div class="now-playing-info song">
       <div class="time-flow"><span class="time-elapsed" id="time-elapsed"></span><span class="time-remaining" id="time-remaining"></span></div>
       <span id='current'></span><? echo _(" "); ?><span class="length" id="song-length"></span><? echo _(" ") ?></div>
     <div class="progressbar">
       <div class="progress-song" id="progress-bar" style="width:0%;"></div>
     </div>
-    <div class="text-row next-song"><strong><? echo _("Next:"); ?></strong><? echo _(" "); ?><span id='next'></span><? echo _(" "); ?><span id='next-length'></span></div>
+    <div class="text-row next-song"><strong><? echo _("Next:"); ?></strong> <span id='next'></span> <span id='next-length'></span></div>
   </div>
     <div class="show-block">
       <div class="text-row">&nbsp;</div>
@@ -26,7 +26,7 @@
       <li>
         <div id="master_dj_div" class="source-label">
           <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
-          Master Source
+          <? echo _("Master Source") ?>
         </div>
         <div class="line-to-switch"></div>
         <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
@@ -35,7 +35,7 @@
       <li>
         <div id="live_dj_div" class="source-label">
         <a id="live_dj" class="source-kick-button" onclick="kickSource(this)"></a>
-          Show Source
+          <? echo _("Show Source")?>
         </div>
         <div class="line-to-switch"></div>
         <a href="#" id="live_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->live_dj_switch?></span></a>
diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
index 38c50ba56..2ccbac174 100644
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
@@ -6,7 +6,7 @@
            <div class="trial-box-calendar-gray"><? echo _("days") ?></div>
       </div>
       <div class="trial-box-button">
-            <a title="Purchase your copy of Airtime" href="https://account.sourcefabric.com/clientarea.php" target="_blank"><? echo _("My Account") ?></a>
+            <a title="<?php echo _("Purchase your copy of Airtime")?> href="https://account.sourcefabric.com/clientarea.php" target="_blank"><? echo _("My Account") ?></a>
       </div>
   </div>
 <?php }?> 
diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index d5d4c55e1..a3aa04884 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -7,7 +7,7 @@ if (isset($this->obj)) {
 <div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
-            New <span class="caret"></span>
+            <? echo _("New")?> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
             <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
index bdc203433..176d8b8ac 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-cue.phtml
@@ -1,10 +1,10 @@
 <dl id="spl_cue_editor" class="inline-list">
-    <dt><? echo _("Cue In: "); ?><span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
+    <dt><? echo _("Cue In: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt>
     <dd id="spl_cue_in_<?php echo $this->id; ?>" class="spl_cue_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueIn; ?></span>
     </dd>
     <dd class="edit-error"></dd>
-    <dt><? echo _("Cue Out: "); ?><span class='spl_cue_hint'>(hh:mm:ss.t)</span></dt>
+    <dt><? echo _("Cue Out: "); ?><span class='spl_cue_hint'><? echo _("(hh:mm:ss.t)")?></span></dt>
     <dd id="spl_cue_out_<?php echo $this->id; ?>" class="spl_cue_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->cueOut; ?></span>
     </dd>
diff --git a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
index b5719fca5..17f1e7c60 100644
--- a/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/set-fade.phtml
@@ -1,13 +1,13 @@
 <dl id="spl_editor" class="inline-list">
     <?php if ($this->item1Type == 0) {?>
-    <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
+    <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
     <dd id="spl_fade_out_<?php echo $this->item1; ?>" class="spl_fade_out">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeOut; ?></span>
     </dd>
     <dd class="edit-error"></dd>
     <?php }
     if ($this->item2Type == 0) {?>
-    <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
+    <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
     <dd id="spl_fade_in_<?php echo $this->item2; ?>" class="spl_fade_in">
         <span contenteditable="true" class="spl_text_input"><?php echo $this->fadeIn; ?></span>
     </dd>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index 5d8e19bfe..b1ca48da5 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -7,7 +7,7 @@ if (isset($this->obj)) {
 <div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
-            New <span class="caret"></span>
+            <? echo _("New")?> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
             <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>
@@ -65,10 +65,10 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
       	<span class="ui-icon ui-icon-closethick"></span>
 	    <dl id="spl_editor-main" class="inline-list">
-            <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade in: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
             <dd class="edit-error"></dd>
-            <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'>(ss.t)</span></dt>
+            <dt><? echo _("Fade out: "); ?><span class='spl_cue_hint'><? echo _("(ss.t)")?></span></dt>
             <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
             <dd class="edit-error"></dd>
         </dl>
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index 87cd0662f..20ef17665 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -37,12 +37,12 @@ if ($item['type'] == 2) {
                         if ($staticBlock) {?>
                 <span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">
                     <span class="ui-icon ui-icon-triangle-2-n-s"></span>
-                    Expand Static Block
+                    <?php echo _("Expand Static Block")?>
                 </span>
                 <?php   } else { ?>
                 <span class="spl_block_expand close" blockId="<?php echo $item["item_id"]; ?>" id="expand_block_<?php echo $item["id"]?>">
                     <span class="ui-icon ui-icon-triangle-2-n-s"></span>
-                    Expand Dynamic Block
+                    <?php echo _("Expand Dynamic Block")?>
                 </span>
                 <?php   }
                       } ?>
@@ -95,9 +95,9 @@ if ($item['type'] == 2) {
 <li class="spl_empty">
 <?php
     if ($this->obj instanceof Application_Model_Block) {
-        echo 'Empty smart block';
+        echo _("Empty smart block");
     } else {
-        echo 'Empty playlist';
+        echo _("Empty playlist");
     }
 ?>
 </li>
diff --git a/airtime_mvc/application/views/scripts/plupload/upload.phtml b/airtime_mvc/application/views/scripts/plupload/upload.phtml
index f5bdf10e3..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/plupload/upload.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/upload.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Library") ?></b><? echo _(" and script/action name "); ?><b><? echo _("upload"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
index 926577075..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/get-show-schedule.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Recorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getShowSchedule"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/recorder/index.phtml b/airtime_mvc/application/views/scripts/recorder/index.phtml
index df61e6170..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/recorder/index.phtml
+++ b/airtime_mvc/application/views/scripts/recorder/index.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Recorder") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
index 1255adb3f..121934f4f 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
@@ -3,7 +3,7 @@
         <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
         <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
             <span class="ui-icon ui-icon-plusthick"></span> 
-            <span class="ui-button-text"><?php echo ($this->addNewShow ? "Add this show" : "Update show"); ?></span> 
+            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span> 
         </button>
     </div>
     <div class="clear"></div>
@@ -20,7 +20,7 @@
     <div id="live-stream-override" class="collapsible-content">
         <?php echo $this->live; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span>Record & Rebroadcast</h3>  
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Record & Rebroadcast")?></h3>  
     <div id="schedule-record-rebroadcast" class="collapsible-content">
         <?php echo $this->rr; ?>
         <?php echo $this->absoluteRebroadcast; ?>
@@ -37,7 +37,7 @@
     <div class="button-bar bottom">
         <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
             <span class="ui-icon ui-icon-plusthick"></span> 
-            <span class="ui-button-text"><?php echo ($this->addNewShow ? "Add this show" : "Update show"); ?></span> 
+            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") :  _("Update show")); ?></span> 
         </button>
     </div>
 </div>
diff --git a/airtime_mvc/application/views/scripts/schedule/add-show.phtml b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
index 26e3bca4e..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("addShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
index c2446a08a..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-current-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("cancelCurrentShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
index 2fda81da7..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/cancel-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("cancelShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
index 9247dd187..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/clear-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("clearShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
index de6b6761c..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/delete-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("deleteShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
index 2073b4b29..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/event-feed.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("eventFeed"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
index 3f7a4775f..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/make-context-menu.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("makeContextMenu"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/move-show.phtml b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
index 711bf18ba..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/move-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/move-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("moveShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
index 27d996297..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/remove-group.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("removeGroup"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
index b676100ea..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/resize-show.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("Schedule") ?></b><? echo _(" and script/action name "); ?><b><? echo _("resizeShow"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
index 04851dfc4..de83466a5 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
@@ -12,7 +12,7 @@
     <div class="sb-timerange">
         <?php if(!$this->disableLib && !$this->showLib):?>
         <a id="sb_edit" class="btn btn-small" href="#" title="Open library to add or remove content">
-            Add / Remove Content
+            <?php echo _("Add / Remove Content")?>
         </a> 
         <?php endif; ?>
     <?php echo $this->sb_form; ?>
diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml
index efc9cabd9..2a6a2795d 100644
--- a/airtime_mvc/application/views/scripts/user/add-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/add-user.phtml
@@ -7,7 +7,7 @@
             <div class="button-holder">
                 <button type="button" id="add_user_button" name="search_add_group" class="ui-button ui-widget ui-state-default ui-button-text-icon-primary">
                     <span class="ui-icon ui-icon-plusthick"></span>
-                    <span class="ui-button-text">New&nbsp;User</span>
+                    <span class="ui-button-text"><? echo _("New")?>&nbsp;<? echo _("User")?></span>
                 </button>
             </div>
 
@@ -16,9 +16,9 @@
                     <tr>
                         <th><? echo _("id") ?></th>
                         <th><? echo _("Username") ?></th>
-                        <th>First&nbsp;Name</th>
-                        <th>Last&nbsp;Name</th>
-                        <th>User&nbsp;Type</th>
+                        <th><? echo _("First")?>&nbsp;<? echo _("Name")?></th>
+                        <th><? echo _("Last")?>&nbsp;<? echo _("Name")?></th>
+                        <th><? echo _("User")?>&nbsp;<? echo _("Type")?></th>
                         <th>&nbsp;</th>
                     </tr>
                 </thead>
diff --git a/airtime_mvc/application/views/scripts/user/get-hosts.phtml b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
index 693045e35..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/user/get-hosts.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-hosts.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getHosts"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
index a7182a5ce..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
+++ b/airtime_mvc/application/views/scripts/user/get-user-data-table-info.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("getUserDataTableInfo"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/user/index.phtml b/airtime_mvc/application/views/scripts/user/index.phtml
index 00b89a16a..e69de29bb 100644
--- a/airtime_mvc/application/views/scripts/user/index.phtml
+++ b/airtime_mvc/application/views/scripts/user/index.phtml
@@ -1 +0,0 @@
-<br /><br /><center><? echo _("View script for controller "); ?><b><? echo _("User") ?></b><? echo _(" and script/action name "); ?><b><? echo _("index"); ?></b></center>
diff --git a/airtime_mvc/application/views/scripts/webstream/webstream.phtml b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
index 5e8ff45db..34131aabd 100644
--- a/airtime_mvc/application/views/scripts/webstream/webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/webstream.phtml
@@ -1,7 +1,7 @@
 <div class="btn-toolbar spl-no-top-margin clearfix">
     <div class="btn-group pull-left">
         <button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
-            New <span class="caret"></span>
+            <? echo _("New")?> <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
             <li id='lib-new-pl'><a href="#"><? echo _("New Playlist") ?></a></li>

From 105325994f1d8f8a044b0f54076c478215746cb4 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 12:55:45 -0500
Subject: [PATCH 04/11] CC-1960: Internationalize Airtime / Support
 translations

- added gettext wrapper function to all strings in controllers
---
 .../application/controllers/ApiController.php | 18 ++++----
 .../controllers/AudiopreviewController.php    |  2 +-
 .../controllers/DashboardController.php       | 10 ++--
 .../controllers/ErrorController.php           |  4 +-
 .../controllers/LibraryController.php         | 46 +++++++++----------
 .../controllers/LoginController.php           |  8 ++--
 .../controllers/PlaylistController.php        | 20 ++++----
 .../controllers/PreferenceController.php      | 12 ++---
 .../controllers/ScheduleController.php        | 36 ++++++++-------
 .../controllers/ShowbuilderController.php     | 10 ++--
 .../controllers/UserController.php            |  6 +--
 .../controllers/WebstreamController.php       |  8 ++--
 12 files changed, 91 insertions(+), 89 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 1b47a924c..198d96351 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -53,7 +53,7 @@ class ApiController extends Zend_Controller_Action
         if (!in_array($api_key, $CC_CONFIG["apiKey"]) &&
             is_null(Zend_Auth::getInstance()->getStorage()->read())) {
             header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource.';
+            print _('You are not allowed to access this resource.');
             exit;
         }
     }
@@ -80,7 +80,7 @@ class ApiController extends Zend_Controller_Action
 
         if (is_null(Zend_Auth::getInstance()->getStorage()->read())) {
             header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource.';
+            print _('You are not allowed to access this resource.');
 
             return;
         }
@@ -282,7 +282,7 @@ class ApiController extends Zend_Controller_Action
             echo isset($_GET['callback']) ? $_GET['callback'].'('.json_encode($result).')' : json_encode($result);
         } else {
             header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource. ';
+            print _('You are not allowed to access this resource. ');
             exit;
         }
     }
@@ -321,7 +321,7 @@ class ApiController extends Zend_Controller_Action
             echo isset($_GET['callback']) ? $_GET['callback'].'('.json_encode($result).')' : json_encode($result);
         } else {
             header('HTTP/1.0 401 Unauthorized');
-            print 'You are not allowed to access this resource. ';
+            print _('You are not allowed to access this resource. ');
             exit;
         }
     }
@@ -502,7 +502,7 @@ class ApiController extends Zend_Controller_Action
 
             //File is not in database anymore.
             if (is_null($file)) {
-                $return_hash['error'] = "File does not exist in Airtime.";
+                $return_hash['error'] = _("File does not exist in Airtime.");
 
                 return $return_hash;
             }
@@ -515,7 +515,7 @@ class ApiController extends Zend_Controller_Action
                 $md['MDATA_KEY_ORIGINAL_PATH']);
 
             if (is_null($file)) {
-                $return_hash['error'] = 'File does not exist in Airtime';
+                $return_hash['error'] = _('File does not exist in Airtime');
             } else {
                 $filepath = $md['MDATA_KEY_FILEPATH'];
                 //$filepath = str_replace("\\", "", $filepath);
@@ -527,7 +527,7 @@ class ApiController extends Zend_Controller_Action
             $file = Application_Model_StoredFile::RecallByFilepath($filepath);
 
             if (is_null($file)) {
-                $return_hash['error'] = "File doesn't exist in Airtime.";
+                $return_hash['error'] = _("File doesn't exist in Airtime.");
                 Logging::warn("Attempt to delete file that doesn't exist.
                     Path: '$filepath'");
 
@@ -573,7 +573,7 @@ class ApiController extends Zend_Controller_Action
                 Logging::info("Received bad request(key=$k), no 'mode' parameter. Bad request is:");
                 Logging::info( $info_json );
                 array_push( $responses, array(
-                    'error' => "Bad request. no 'mode' parameter passed.",
+                    'error' => _("Bad request. no 'mode' parameter passed."),
                     'key' => $k));
                 continue;
             } elseif ( !in_array($info_json['mode'], $valid_modes) ) {
@@ -583,7 +583,7 @@ class ApiController extends Zend_Controller_Action
                 Logging::info("Received bad request(key=$k). 'mode' parameter was invalid with value: '$mode'. Request:");
                 Logging::info( $info_json );
                 array_push( $responses, array(
-                    'error' => "Bad request. 'mode' parameter is invalid",
+                    'error' => _("Bad request. 'mode' parameter is invalid"),
                     'key' => $k,
                     'mode' => $mode ) );
                 continue;
diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index afd413631..3adf3351c 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -210,7 +210,7 @@ class AudiopreviewController extends Zend_Controller_Action
                 throw new Exception("Unknown file type: $mime");
             }
 
-            $elementMap['uri'] = "/api/get-media/file/".$track['item_id'];
+            $elementMap['uri'] = $baseUrl."/api/get-media/file/".$track['item_id'];
         } else {
             $elementMap['uri'] = $track['path'];
         }
diff --git a/airtime_mvc/application/controllers/DashboardController.php b/airtime_mvc/application/controllers/DashboardController.php
index 1e693b08f..fe0a0e71c 100644
--- a/airtime_mvc/application/controllers/DashboardController.php
+++ b/airtime_mvc/application/controllers/DashboardController.php
@@ -33,9 +33,9 @@ class DashboardController extends Zend_Controller_Action
             Application_Model_RabbitMq::SendMessageToPypo("disconnect_source", $data);
         } else {
             if ($source_connected) {
-                $this->view->error = "You don't have permission to disconnect source.";
+                $this->view->error = _("You don't have permission to disconnect source.");
             } else {
-                $this->view->error = "There is no source connected to this input.";
+                $this->view->error = _("There is no source connected to this input.");
             }
         }
     }
@@ -79,12 +79,12 @@ class DashboardController extends Zend_Controller_Action
             }
         } else {
             if ($source_connected) {
-                $this->view->error = "You don't have permission to switch source.";
+                $this->view->error = _("You don't have permission to switch source.");
             } else {
                 if ($sourcename == 'scheduled_play') {
-                    $this->view->error = "You don't have permission to disconnect source.";
+                    $this->view->error = _("You don't have permission to disconnect source.");
                 } else {
-                    $this->view->error = "There is no source connected to this input.";
+                    $this->view->error = _("There is no source connected to this input.");
                 }
             }
         }
diff --git a/airtime_mvc/application/controllers/ErrorController.php b/airtime_mvc/application/controllers/ErrorController.php
index 2c1aa0b87..0a4fee725 100644
--- a/airtime_mvc/application/controllers/ErrorController.php
+++ b/airtime_mvc/application/controllers/ErrorController.php
@@ -14,12 +14,12 @@ class ErrorController extends Zend_Controller_Action
 
                 // 404 error -- controller or action not found
                 $this->getResponse()->setHttpResponseCode(404);
-                $this->view->message = 'Page not found';
+                $this->view->message = _('Page not found');
                 break;
             default:
                 // application error
                 $this->getResponse()->setHttpResponseCode(500);
-                $this->view->message = 'Application error';
+                $this->view->message = _('Application error');
                 break;
         }
 
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index 2e00a4208..f484388da 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -90,7 +90,7 @@ class LibraryController extends Zend_Controller_Action
 
     protected function playlistNotFound($p_type)
     {
-        $this->view->error = "$p_type not found";
+        $this->view->error = sprintf(_("%s not found"), $p_type);
 
         Logging::info("$p_type not found");
         Application_Model_Library::changePlaylist(null, $p_type);
@@ -99,7 +99,7 @@ class LibraryController extends Zend_Controller_Action
 
     protected function playlistUnknownError($e)
     {
-        $this->view->error = "Something went wrong.";
+        $this->view->error = _("Something went wrong.");
         Logging::info($e->getMessage());
     }
 
@@ -156,7 +156,7 @@ class LibraryController extends Zend_Controller_Action
         $user = new Application_Model_User($userInfo->id);
 
         //Open a jPlayer window and play the audio clip.
-        $menu["play"] = array("name"=> "Preview", "icon" => "play", "disabled" => false);
+        $menu["play"] = array("name"=> _("Preview"), "icon" => "play", "disabled" => false);
 
         $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
 
@@ -177,19 +177,19 @@ class LibraryController extends Zend_Controller_Action
                 }
                 if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
                     if ($obj_sess->type === "playlist") {
-                        $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
+                        $menu["pl_add"] = array("name"=> _("Add to Playlist"), "icon" => "add-playlist", "icon" => "copy");
                     } elseif ($obj_sess->type === "block" && $obj->isStatic()) {
-                        $menu["pl_add"] = array("name"=> "Add to Smart Block", "icon" => "add-playlist", "icon" => "copy");
+                        $menu["pl_add"] = array("name"=> _("Add to Smart Block"), "icon" => "add-playlist", "icon" => "copy");
                     }
                 }
             }
             if ($isAdminOrPM || $file->getFileOwnerId() == $user->getId()) {
-                $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete");
-                $menu["edit"] = array("name"=> "Edit Metadata", "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}");
+                $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."/library/delete");
+                $menu["edit"] = array("name"=> _("Edit Metadata"), "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}");
             }
 
             $url = $file->getRelativeFileUrl($baseUrl).'/download/true';
-            $menu["download"] = array("name" => "Download", "icon" => "download", "url" => $url);
+            $menu["download"] = array("name" => _("Download"), "icon" => "download", "url" => $url);
         } elseif ($type === "playlist" || $type === "block") {
             if ($type === 'playlist') {
                 $obj = new Application_Model_Playlist($id);
@@ -200,19 +200,19 @@ class LibraryController extends Zend_Controller_Action
                 }
                 if (($isAdminOrPM || $obj->getCreatorId() == $user->getId()) && $screen == "playlist") {
                     if ($obj_sess->type === "playlist") {
-                        $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
+                        $menu["pl_add"] = array("name"=> _("Add to Playlist"), "icon" => "add-playlist", "icon" => "copy");
                     }
                 }
             }
 
             if ($obj_sess->id !== $id && $screen == "playlist") {
                 if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
-                    $menu["edit"] = array("name"=> "Edit", "icon" => "edit");
+                    $menu["edit"] = array("name"=> _("Edit"), "icon" => "edit");
                 }
             }
 
             if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
-                $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete");
+                $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."/library/delete");
             }
         } elseif ($type == "stream") {
 
@@ -221,15 +221,15 @@ class LibraryController extends Zend_Controller_Action
             if (isset($obj_sess->id) && $screen == "playlist") {
                 if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
                     if ($obj_sess->type === "playlist") {
-                        $menu["pl_add"] = array("name"=> "Add to Playlist", "icon" => "add-playlist", "icon" => "copy");
+                        $menu["pl_add"] = array("name"=> _("Add to Playlist"), "icon" => "add-playlist", "icon" => "copy");
                     }
                 }
             }
             if ($isAdminOrPM || $obj->getCreatorId() == $user->getId()) {
                 if ($screen == "playlist") {
-                    $menu["edit"] = array("name"=> "Edit", "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}");
+                    $menu["edit"] = array("name"=> _("Edit"), "icon" => "edit", "url" => $baseUrl."/library/edit-file-md/id/{$id}");
                 }
-                $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/library/delete");
+                $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."/library/delete");
             }
         }
 
@@ -240,26 +240,26 @@ class LibraryController extends Zend_Controller_Action
             $menu["sep1"] = "-----------";
 
             //create a sub menu for Soundcloud actions.
-            $menu["soundcloud"] = array("name" => "Soundcloud", "icon" => "soundcloud", "items" => array());
+            $menu["soundcloud"] = array("name" => _("Soundcloud"), "icon" => "soundcloud", "items" => array());
 
             $scid = $file->getSoundCloudId();
 
             if ($scid > 0) {
                 $url = $file->getSoundCloudLinkToFile();
-                $menu["soundcloud"]["items"]["view"] = array("name" => "View on Soundcloud", "icon" => "soundcloud", "url" => $url);
+                $menu["soundcloud"]["items"]["view"] = array("name" => _("View on Soundcloud"), "icon" => "soundcloud", "url" => $url);
             }
 
             if (!is_null($scid)) {
-                $text = "Re-upload to SoundCloud";
+                $text = _("Re-upload to SoundCloud");
             } else {
-                $text = "Upload to SoundCloud";
+                $text = _("Upload to SoundCloud");
             }
 
             $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => $baseUrl."/library/upload-file-soundcloud/id/{$id}");
         }
 
         if (empty($menu)) {
-            $menu["noaction"] = array("name"=>"No action available");
+            $menu["noaction"] = array("name"=>_("No action available"));
         }
 
         $this->view->items = $menu;
@@ -279,7 +279,7 @@ class LibraryController extends Zend_Controller_Action
         $streams   = array();
 
         $message = null;
-        $noPermissionMsg = "You don't have permission to delete selected items.";
+        $noPermissionMsg = _("You don't have permission to delete selected items.");
 
         foreach ($mediaItems as $media) {
 
@@ -328,7 +328,7 @@ class LibraryController extends Zend_Controller_Action
                     $message = $noPermissionMsg;
                 } catch (Exception $e) {
                     //could throw a scheduled in future exception.
-                    $message = "Could not delete some scheduled files.";
+                    $message = _("Could not delete some scheduled files.");
                     Logging::debug($e->getMessage());
                 }
             }
@@ -455,10 +455,10 @@ class LibraryController extends Zend_Controller_Action
 
                 $this->view->md = $md;
                 if ($block->isStatic()) {
-                    $this->view->blType = 'Static';
+                    $this->view->blType = _('Static');
                     $this->view->contents = $block->getContents();
                 } else {
-                    $this->view->blType = 'Dynamic';
+                    $this->view->blType = _('Dynamic');
                     $this->view->contents = $block->getCriteria();
                 }
                 $this->view->block = $block;
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index d4d66bf50..76be05bf4 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -31,7 +31,7 @@ class LoginController extends Zend_Controller_Action
 
         $form = new Application_Form_Login();
 
-        $message = "Please enter your user name and password";
+        $message = _("Please enter your user name and password");
 
         if ($request->isPost()) {
             // if the post contains recaptcha field, which means form had recaptcha field.
@@ -70,7 +70,7 @@ class LoginController extends Zend_Controller_Action
 
                         $this->_redirect('Showbuilder');
                     } else {
-                        $message = "Wrong username or password provided. Please try again.";
+                        $message = _("Wrong username or password provided. Please try again.");
                         Application_Model_Subjects::increaseLoginAttempts($username);
                         Application_Model_LoginAttempts::increaseAttempts($_SERVER['REMOTE_ADDR']);
                         $form = new Application_Form_Login();
@@ -132,10 +132,10 @@ class LoginController extends Zend_Controller_Action
                     if ($success) {
                         $this->_helper->redirector('password-restore-after', 'login');
                     } else {
-                        $form->email->addError($this->view->translate("Email could not be sent. Check your mail server settings and ensure it has been configured properly."));
+                        $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
                     }
                 } else {
-                    $form->email->addError($this->view->translate("Given email not found."));
+                    $form->email->addError($this->view->translate(_("Given email not found.")));
                 }
             }
 
diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php
index 0d2ead443..ac8dd5ea1 100644
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@@ -41,7 +41,7 @@ class PlaylistController extends Zend_Controller_Action
             $modified = $this->_getParam('modified', null);
             if ($obj->getLastModified("U") !== $modified) {
                 $this->createFullResponse($obj);
-                throw new PlaylistOutDatedException("You are viewing an older version of {$obj->getName()}");
+                throw new PlaylistOutDatedException(sprintf(_("You are viewing an older version of %s"), $obj->getName()));
             }
         }
 
@@ -113,14 +113,14 @@ class PlaylistController extends Zend_Controller_Action
 
     private function blockDynamic($obj)
     {
-        $this->view->error = "You cannot add tracks to dynamic blocks.";
+        $this->view->error = _("You cannot add tracks to dynamic blocks.");
         $this->createFullResponse($obj);
     }
 
     private function playlistNotFound($p_type, $p_isJson = false)
     {
         $p_type = ucfirst($p_type);
-        $this->view->error = "{$p_type} not found";
+        $this->view->error = sprintf(_("%s not found"), $p_type);
 
         Logging::info("{$p_type} not found");
         Application_Model_Library::changePlaylist(null, $p_type);
@@ -134,26 +134,26 @@ class PlaylistController extends Zend_Controller_Action
 
     private function playlistNoPermission($p_type)
     {
-        $this->view->error = "You don't have permission to delete selected {$p_type}(s).";
+        $this->view->error = sprintf(_("You don't have permission to delete selected %s(s)."), $p_type);
         $this->changePlaylist(null, $p_type);
         $this->createFullResponse(null);
     }
 
     private function playlistUnknownError($e)
     {
-        $this->view->error = "Something went wrong.";
+        $this->view->error = _("Something went wrong.");
         Logging::info($e->getMessage());
     }
 
     private function wrongTypeToBlock($obj)
     {
-        $this->view->error = "You can only add tracks to smart block.";
+        $this->view->error = _("You can only add tracks to smart block.");
         $this->createFullResponse($obj);
     }
 
     private function wrongTypeToPlaylist($obj)
     {
-        $this->view->error = "You can only add tracks, smart blocks, and webstreams to playlists.";
+        $this->view->error = _("You can only add tracks, smart blocks, and webstreams to playlists.");
         $this->createFullResponse($obj);
     }
 
@@ -165,9 +165,9 @@ class PlaylistController extends Zend_Controller_Action
 
         $objInfo = Application_Model_Library::getObjInfo($type);
 
-        $name = 'Untitled Playlist';
+        $name = _('Untitled Playlist');
         if ($type == 'block') {
-            $name = 'Untitled Smart Block';
+            $name = _('Untitled Smart Block');
         }
 
         $obj = new $objInfo['className']();
@@ -430,7 +430,7 @@ class PlaylistController extends Zend_Controller_Action
 
     public function setPlaylistNameDescAction()
     {
-        $name = $this->_getParam('name', 'Unknown Playlist');
+        $name = $this->_getParam('name', _('Unknown Playlist'));
         $description = $this->_getParam('description', "");
         $type = $this->_getParam('type');
 
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 73856775a..d0d8ba89a 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -66,7 +66,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]);
                 Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);
 
-                $this->view->statusMsg = "<div class='success'>Preferences updated.</div>";
+                $this->view->statusMsg = "<div class='success'>_(Preferences updated.)</div>";
                 $this->view->form = $form;
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))));
             } else {
@@ -118,7 +118,7 @@ class PreferenceController extends Zend_Controller_Action
                         Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                     }
                 }
-                $this->view->statusMsg = "<div class='success'>Support setting updated.</div>";
+                $this->view->statusMsg = "<div class='success'>_(Support setting updated.)</div>";
             }
         }
         $logo = Application_Model_Preference::GetStationLogo();
@@ -130,7 +130,7 @@ class PreferenceController extends Zend_Controller_Action
             $privacyChecked = true;
         }
         $this->view->privacyChecked = $privacyChecked;
-        $this->view->section_title = 'Support Feedback';
+        $this->view->section_title = _('Support Feedback');
         $this->view->form = $form;
         //$form->render($this->view);
     }
@@ -301,7 +301,7 @@ class PreferenceController extends Zend_Controller_Action
                 $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
                 $this->view->form = $form;
                 $this->view->num_stream = $num_of_stream;
-                $this->view->statusMsg = "<div class='success'>Stream Setting Updated.</div>";
+                $this->view->statusMsg = "<div class='success'>_(Stream Setting Updated.)</div>";
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/stream-setting.phtml'))));
             } else {
                 $live_stream_subform->updateVariables();
@@ -328,7 +328,7 @@ class PreferenceController extends Zend_Controller_Action
 
         if (is_null($path)) {
             $element = array();
-            $element["name"] = "path should be specified";
+            $element["name"] = _("path should be specified");
             $element["isFolder"] = false;
             $element["isError"] = true;
             $result[$path] = $element;
@@ -422,7 +422,7 @@ class PreferenceController extends Zend_Controller_Action
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         for ($i=1; $i<=$num_of_stream; $i++) {
             $status = Application_Model_StreamSetting::getLiquidsoapError($i);
-            $status = $status == NULL?"Problem with Liquidsoap...":$status;
+            $status = $status == NULL?_("Problem with Liquidsoap..."):$status;
             if (!Application_Model_StreamSetting::getStreamEnabled($i)) {
                 $status = "N/A";
             }
diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index c21b2d29a..93729ff1f 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -250,7 +250,7 @@ class ScheduleController extends Zend_Controller_Action
             $file = $instance->getRecordedFile();
             $fileId = $file->getId();
 
-            $menu["view_recorded"] = array("name" => "View Recorded File Metadata", "icon" => "overview",
+            $menu["view_recorded"] = array("name" => _("View Recorded File Metadata"), "icon" => "overview",
                     "url" => $baseUrl."/library/edit-file-md/id/".$fileId);
         }
 
@@ -259,17 +259,17 @@ class ScheduleController extends Zend_Controller_Action
                 && !$instance->isRecorded()
                 && !$instance->isRebroadcast()) {
 
-                $menu["schedule"] = array("name"=> "Add / Remove Content", "icon" => "add-remove-content",
+                $menu["schedule"] = array("name"=> _("Add / Remove Content"), "icon" => "add-remove-content",
                     "url" => $baseUrl."/showbuilder/builder-dialog/");
 
-                $menu["clear"] = array("name"=> "Remove All Content", "icon" => "remove-all-content",
+                $menu["clear"] = array("name"=> _("Remove All Content"), "icon" => "remove-all-content",
                     "url" => $baseUrl."/schedule/clear-show");
             }
         }
 
         if (!$instance->isRecorded()) {
 
-            $menu["content"] = array("name"=> "Show Content", "icon" => "overview", "url" => $baseUrl."/schedule/show-content-dialog");
+            $menu["content"] = array("name"=> _("Show Content"), "icon" => "overview", "url" => $baseUrl."/schedule/show-content-dialog");
         }
 
         if ($showEndLocalDT->getTimestamp() <= $epochNow
@@ -282,10 +282,10 @@ class ScheduleController extends Zend_Controller_Action
 
             if ($scid > 0) {
                 $url = $file->getSoundCloudLinkToFile();
-                $menu["soundcloud_view"] = array("name" => "View on Soundcloud", "icon" => "soundcloud", "url" => $url);
+                $menu["soundcloud_view"] = array("name" => _("View on Soundcloud"), "icon" => "soundcloud", "url" => $url);
             }
 
-            $text = is_null($scid) ? 'Upload to SoundCloud' : 'Re-upload to SoundCloud';
+            $text = is_null($scid) ? _('Upload to SoundCloud') : _('Re-upload to SoundCloud');
             $menu["soundcloud_upload"] = array("name"=> $text, "icon" => "soundcloud");
         }
 
@@ -293,34 +293,34 @@ class ScheduleController extends Zend_Controller_Action
                 $epochNow < $showEndLocalDT->getTimestamp() && $isAdminOrPM) {
 
             if ($instance->isRecorded()) {
-                $menu["cancel_recorded"] = array("name"=> "Cancel Current Show", "icon" => "delete");
+                $menu["cancel_recorded"] = array("name"=> _("Cancel Current Show"), "icon" => "delete");
             } else {
 
                 if (!$instance->isRebroadcast()) {
-                    $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => $baseUrl."/Schedule/populate-show-form");
+                    $menu["edit"] = array("name"=> _("Edit Show"), "icon" => "edit", "_type"=>"all", "url" => $baseUrl."/Schedule/populate-show-form");
                 }
 
-                $menu["cancel"] = array("name"=> "Cancel Current Show", "icon" => "delete");
+                $menu["cancel"] = array("name"=> _("Cancel Current Show"), "icon" => "delete");
             }
         }
 
         if ($epochNow < $showStartLocalDT->getTimestamp()) {
 
                 if (!$instance->isRebroadcast() && $isAdminOrPM) {
-                    $menu["edit"] = array("name"=> "Edit Show", "icon" => "edit", "_type"=>"all", "url" => $baseUrl."/Schedule/populate-show-form");
+                    $menu["edit"] = array("name"=> _("Edit Show"), "icon" => "edit", "_type"=>"all", "url" => $baseUrl."/Schedule/populate-show-form");
                 }
 
                 if ($instance->getShow()->isRepeating() && $isAdminOrPM) {
 
                     //create delete sub menu.
-                    $menu["del"] = array("name"=> "Delete", "icon" => "delete", "items" => array());
+                    $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "items" => array());
 
-                    $menu["del"]["items"]["single"] = array("name"=> "Delete This Instance", "icon" => "delete", "url" => $baseUrl."/schedule/delete-show");
+                    $menu["del"]["items"]["single"] = array("name"=> _("Delete This Instance"), "icon" => "delete", "url" => $baseUrl."/schedule/delete-show");
 
-                    $menu["del"]["items"]["following"] = array("name"=> "Delete This Instance and All Following", "icon" => "delete", "url" => $baseUrl."/schedule/cancel-show");
+                    $menu["del"]["items"]["following"] = array("name"=> _("Delete This Instance and All Following"), "icon" => "delete", "url" => $baseUrl."/schedule/cancel-show");
                 } elseif ($isAdminOrPM) {
 
-                    $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/schedule/delete-show");
+                    $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."/schedule/delete-show");
                 }
         }
 
@@ -443,8 +443,10 @@ class ScheduleController extends Zend_Controller_Action
             $originalDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
             //$timestamp  = Application_Common_DateHelper::ConvertToLocalDateTimeString($originalDateTime->format("Y-m-d H:i:s"));
             $this->view->additionalShowInfo =
-                "Rebroadcast of show \"$originalShowName\" from "
-                .$originalDateTime->format("l, F jS")." at ".$originalDateTime->format("G:i");
+                sprintf(_("Rebroadcast of show %s from %s at %s"),
+                    $originalShowName,
+                    $originalDateTime->format("l, F jS"),
+                    $originalDateTime->format("G:i"));
         }
         $this->view->showLength = $show->getShowLength();
         $this->view->timeFilled = $show->getTimeScheduled();
@@ -895,7 +897,7 @@ class ScheduleController extends Zend_Controller_Action
         $baseUrl = $this->getRequest()->getBaseUrl();
         $url = $file->getRelativeFileUrl($baseUrl).'/download/true';
         $menu[] = array('action' => array('type' => 'gourl', 'url' => $url),
-                            'title' => 'Download');
+                            'title' => _('Download'));
 
         //returns format jjmenu is looking for.
         die(json_encode($menu));
diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 8080bc536..7760f8f07 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -187,15 +187,15 @@ class ShowbuilderController extends Zend_Controller_Action
         $item = CcScheduleQuery::create()->findPK($id);
         $instance = $item->getCcShowInstances();
 
-        $menu["preview"] = array("name"=> "Preview", "icon" => "play");
+        $menu["preview"] = array("name"=> _("Preview"), "icon" => "play");
         //select the cursor
-        $menu["selCurs"] = array("name"=> "Select cursor","icon" => "select-cursor");
-        $menu["delCurs"] = array("name"=> "Remove cursor","icon" => "select-cursor");
+        $menu["selCurs"] = array("name"=> _("Select cursor"),"icon" => "select-cursor");
+        $menu["delCurs"] = array("name"=> _("Remove cursor"),"icon" => "select-cursor");
 
         if ($now < floatval($item->getDbEnds("U.u")) && $user->canSchedule($instance->getDbShowId())) {
 
             //remove/truncate the item from the schedule
-            $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => $baseUrl."/showbuilder/schedule-remove");
+            $menu["del"] = array("name"=> _("Delete"), "icon" => "delete", "url" => $baseUrl."/showbuilder/schedule-remove");
         }
 
         $this->view->items = $menu;
@@ -209,7 +209,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $instance = CcShowInstancesQuery::create()->findPK($id);
 
         if (is_null($instance)) {
-            $this->view->error = "show does not exist";
+            $this->view->error = _("show does not exist");
 
             return;
         }
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index a9418ea12..57dd35cb1 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -51,7 +51,7 @@ class UserController extends Zend_Controller_Action
                         && $formData['login'] == 'admin' 
                         && $formData['user_id'] != 0) {
                     $this->view->form = $form;
-                    $this->view->successMessage = "<div class='errors'>Specific action is not allowed in demo version!</div>";
+                    $this->view->successMessage = "<div class='errors'>_(Specific action is not allowed in demo version!)</div>";
                     die(json_encode(array("valid"=>"false", "html"=>$this->view->render('user/add-user.phtml'))));
                 } elseif ($form->validateLogin($formData)) {
                     $user = new Application_Model_User($formData['user_id']);
@@ -75,9 +75,9 @@ class UserController extends Zend_Controller_Action
                     $this->view->form = $form;
 
                     if (strlen($formData['user_id']) == 0) {
-                        $this->view->successMessage = "<div class='success'>User added successfully!</div>";
+                        $this->view->successMessage = "<div class='success'>_(User added successfully!)</div>";
                     } else {
-                        $this->view->successMessage = "<div class='success'>User updated successfully!</div>";
+                        $this->view->successMessage = "<div class='success'>_(User updated successfully!)</div>";
                     }
                     
                     die(json_encode(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml'))));
diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index ebb5acbf6..4b5aa5298 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -26,11 +26,11 @@ class WebstreamController extends Zend_Controller_Action
 
         //we're not saving this primary key in the DB so it's OK to be -1
         $webstream->setDbId(-1);
-        $webstream->setDbName("Untitled Webstream");
+        $webstream->setDbName(_("Untitled Webstream"));
         $webstream->setDbDescription("");
         $webstream->setDbUrl("http://");
         $webstream->setDbLength("00:30:00");
-        $webstream->setDbName("Untitled Webstream");
+        $webstream->setDbName(_("Untitled Webstream"));
         $webstream->setDbCreatorId($userInfo->id);
         $webstream->setDbUtime(new DateTime("now", new DateTimeZone('UTC')));
         $webstream->setDbMtime(new DateTime("now", new DateTimeZone('UTC')));
@@ -135,7 +135,7 @@ class WebstreamController extends Zend_Controller_Action
 
                 Application_Model_Library::changePlaylist($streamId, "stream");
 
-                $this->view->statusMessage = "<div class='success'>Webstream saved.</div>";
+                $this->view->statusMessage = "<div class='success'>_(Webstream saved.)</div>";
                 $this->view->streamId = $streamId;
                 $this->view->length = $di->format("%Hh %Im");
             } else {
@@ -143,7 +143,7 @@ class WebstreamController extends Zend_Controller_Action
             }
         } catch (Exception $e) {
             Logging::debug($e->getMessage());
-            $this->view->statusMessage = "<div class='errors'>Invalid form values.</div>";
+            $this->view->statusMessage = "<div class='errors'>_(Invalid form values.)</div>";
             $this->view->streamId = -1;
             $this->view->analysis = $analysis;
         }

From 5ba9df9e90a1e23d61bf8011836a656a5151723d Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 13:24:30 -0500
Subject: [PATCH 05/11] CC-1960: Internationalize Airtime / Support
 translations

-added gettext wrapper function to all navigation strings
---
 .../application/configs/navigation.php        | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 59ce874fe..32b4af39d 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -9,85 +9,85 @@
 */
 $pages = array(
     array(
-        'label'      => 'Now Playing',
+        'label'      => _('Now Playing'),
         'module'     => 'default',
         'controller' => 'Showbuilder',
         'action'     => 'index',
         'resource'   =>    'showbuilder'
     ),
     array(
-        'label'      => 'Add Media',
+        'label'      => _('Add Media'),
         'module'     => 'default',
         'controller' => 'Plupload',
         'action'     => 'index',
         'resource'   =>    'plupload'
     ),
     array(
-        'label'      => 'Library',
+        'label'      => _('Library'),
         'module'     => 'default',
         'controller' => 'Library',
         'action'     => 'index',
         'resource'   =>    'playlist'
     ),
     array(
-        'label'      => 'Calendar',
+        'label'      => _('Calendar'),
         'module'     => 'default',
         'controller' => 'Schedule',
         'action'     => 'index',
         'resource'   =>    'schedule'
     ),
     array(
-        'label'      => 'System',
+        'label'      => _('System'),
         'uri'        => '#',
         'resource'   => 'preference',
         'pages'      => array(
             array(
-                'label'      => 'Preferences',
+                'label'      => _('Preferences'),
                 'module'     => 'default',
                 'controller' => 'Preference'
             ),
             array(
-                'label'      => 'Users',
+                'label'      => _('Users'),
                 'module'     => 'default',
                 'controller' => 'user',
                 'action'     => 'add-user',
                 'resource'   =>    'user'
             ),
             array(
-                'label'      => 'Media Folders',
+                'label'      => _('Media Folders'),
                 'module'     => 'default',
                 'controller' => 'Preference',
                 'action'     => 'directory-config',
                 'id'         => 'manage_folder'
             ),
             array(
-                'label'      => 'Streams',
+                'label'      => _('Streams'),
                 'module'     => 'default',
                 'controller' => 'Preference',
                 'action'     => 'stream-setting'
             ),
             array(
-                'label'      => 'Support Feedback',
+                'label'      => _('Support Feedback'),
                 'module'     => 'default',
                 'controller' => 'Preference',
                 'action'     => 'support-setting'
             ),
             array(
-                'label'      => 'Status',
+                'label'      => _('Status'),
                 'module'     => 'default',
                 'controller' => 'systemstatus',
                 'action'     => 'index',
                 'resource'   =>    'systemstatus'
             ),
             array(
-                'label'      => 'Playout History',
+                'label'      => _('Playout History'),
                 'module'     => 'default',
                 'controller' => 'playouthistory',
                 'action'     => 'index',
                 'resource'   => 'playouthistory'
             ),
             array(
-                'label'      => 'Listener Stats',
+                'label'      => _('Listener Stats'),
                 'module'     => 'default',
                 'controller' => 'listenerstat',
                 'action'     => 'index',
@@ -96,24 +96,24 @@ $pages = array(
         )
     ),
     array(
-        'label'      => 'Help',
+        'label'      => _('Help'),
         'uri'     => '#',
         'resource'    =>    'dashboard',
         'pages'      => array(
             array(
-                'label'      => 'Getting Started',
+                'label'      => _('Getting Started'),
                 'module'     => 'default',
                 'controller' => 'dashboard',
                 'action'     => 'help',
                 'resource'   =>    'dashboard'
             ),
             array(
-                'label'      => 'User Manual',
+                'label'      => _('User Manual'),
                 'uri'        => "http://www.sourcefabric.org/en/airtime/manuals/",
                 'target'     => "_blank"
             ),
             array(
-                'label'      => 'About',
+                'label'      => _('About'),
                 'module'     => 'default',
                 'controller' => 'dashboard',
                 'action'     => 'about',

From 4f40efa376e8b38ad556b6d235b06785be6c8c64 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 13:49:44 -0500
Subject: [PATCH 06/11] CC-1960: Internationalize Airtime / Support
 translations

-added gettext wrapper function to all strings in layout, and common
---
 airtime_mvc/application/common/DateHelper.php       | 6 +++---
 airtime_mvc/application/layouts/scripts/login.phtml | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/common/DateHelper.php b/airtime_mvc/application/common/DateHelper.php
index c13543d8e..123189231 100644
--- a/airtime_mvc/application/common/DateHelper.php
+++ b/airtime_mvc/application/common/DateHelper.php
@@ -332,10 +332,10 @@ class Application_Common_DateHelper
         // if year is < 1753 or > 9999 it's out of range
         if ($year < 1753) {
             $retVal['success'] = false;
-            $retVal['errMsg'] = "The year '$year' must be within the range of 1753 - 9999";
+            $retVal['errMsg'] = sprintf(_("The year %s must be within the range of 1753 - 9999"), $year);
         } else if (!checkdate($month, $day, $year)) {
             $retVal['success'] = false;
-            $retVal['errMsg'] = "'$year-$month-$day' is not a valid date";        
+            $retVal['errMsg'] = sprintf(_("%s-%s-%s is not a valid date"), $year, $month, $day);
         } else {
             // check time
             if (isset($timeInfo)) {
@@ -359,7 +359,7 @@ class Application_Common_DateHelper
                 
                 if ( ($hour < 0 || $hour > 23) || ($min < 0 || $min > 59) || ($sec < 0 || $sec > 59) ) {
                     $retVal['success'] = false;
-                    $retVal['errMsg'] = "'$timeInfo[0]:$timeInfo[1]:$timeInfo[2]' is not a valid time";
+                    $retVal['errMsg'] = sprintf(_("%s:%s:%s is not a valid time"), $timeInfo[0], $timeInfo[1] ,$timeInfo[2]);
                 }
             }
         }
diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml
index 42389f11a..966226700 100644
--- a/airtime_mvc/application/layouts/scripts/login.phtml
+++ b/airtime_mvc/application/layouts/scripts/login.phtml
@@ -13,8 +13,9 @@
         <?php echo $this->layout()->content ?>
     </div>
     <div class="footer">
-      Airtime&nbsp;Copyright &copy; Sourcefabric o.p.s. All rights reserved.<br/>
-      Maintained and distributed under GNU GPL v.3 by <a href="http://www.sourcefabric.org"> Sourcefabric o.p.s </a> 
+      <?php echo sprintf(_("Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%s"
+      ."Maintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"),
+      "<br>", "<a href='http://www.sourcefabric.org'>" ,"</a>");?> 
     </div>
  
 </body>

From d7495c69372598976f9e015e0da7ae3cce951650 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 14:05:36 -0500
Subject: [PATCH 07/11] CC-1960: Internationalize Airtime / Support
 translations

- fix to some controller strings
---
 .../application/controllers/PreferenceController.php        | 6 +++---
 airtime_mvc/application/controllers/UserController.php      | 6 +++---
 airtime_mvc/application/controllers/WebstreamController.php | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index d0d8ba89a..69a931c82 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -66,7 +66,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]);
                 Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);
 
-                $this->view->statusMsg = "<div class='success'>_(Preferences updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>". _("Preferences updated.")."</div>";
                 $this->view->form = $form;
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))));
             } else {
@@ -118,7 +118,7 @@ class PreferenceController extends Zend_Controller_Action
                         Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]);
                     }
                 }
-                $this->view->statusMsg = "<div class='success'>_(Support setting updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>"._("Support setting updated.")."</div>";
             }
         }
         $logo = Application_Model_Preference::GetStationLogo();
@@ -301,7 +301,7 @@ class PreferenceController extends Zend_Controller_Action
                 $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf();
                 $this->view->form = $form;
                 $this->view->num_stream = $num_of_stream;
-                $this->view->statusMsg = "<div class='success'>_(Stream Setting Updated.)</div>";
+                $this->view->statusMsg = "<div class='success'>"._("Stream Setting Updated.")."</div>";
                 die(json_encode(array("valid"=>"true", "html"=>$this->view->render('preference/stream-setting.phtml'))));
             } else {
                 $live_stream_subform->updateVariables();
diff --git a/airtime_mvc/application/controllers/UserController.php b/airtime_mvc/application/controllers/UserController.php
index 57dd35cb1..b04a6e98b 100644
--- a/airtime_mvc/application/controllers/UserController.php
+++ b/airtime_mvc/application/controllers/UserController.php
@@ -51,7 +51,7 @@ class UserController extends Zend_Controller_Action
                         && $formData['login'] == 'admin' 
                         && $formData['user_id'] != 0) {
                     $this->view->form = $form;
-                    $this->view->successMessage = "<div class='errors'>_(Specific action is not allowed in demo version!)</div>";
+                    $this->view->successMessage = "<div class='errors'>"._("Specific action is not allowed in demo version!")."</div>";
                     die(json_encode(array("valid"=>"false", "html"=>$this->view->render('user/add-user.phtml'))));
                 } elseif ($form->validateLogin($formData)) {
                     $user = new Application_Model_User($formData['user_id']);
@@ -75,9 +75,9 @@ class UserController extends Zend_Controller_Action
                     $this->view->form = $form;
 
                     if (strlen($formData['user_id']) == 0) {
-                        $this->view->successMessage = "<div class='success'>_(User added successfully!)</div>";
+                        $this->view->successMessage = "<div class='success'>"._("User added successfully!")."</div>";
                     } else {
-                        $this->view->successMessage = "<div class='success'>_(User updated successfully!)</div>";
+                        $this->view->successMessage = "<div class='success'>"._("User updated successfully!")."</div>";
                     }
                     
                     die(json_encode(array("valid"=>"true", "html"=>$this->view->render('user/add-user.phtml'))));
diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php
index 4b5aa5298..8eb9a2ac5 100644
--- a/airtime_mvc/application/controllers/WebstreamController.php
+++ b/airtime_mvc/application/controllers/WebstreamController.php
@@ -135,7 +135,7 @@ class WebstreamController extends Zend_Controller_Action
 
                 Application_Model_Library::changePlaylist($streamId, "stream");
 
-                $this->view->statusMessage = "<div class='success'>_(Webstream saved.)</div>";
+                $this->view->statusMessage = "<div class='success'>"._("Webstream saved.")."</div>";
                 $this->view->streamId = $streamId;
                 $this->view->length = $di->format("%Hh %Im");
             } else {
@@ -143,7 +143,7 @@ class WebstreamController extends Zend_Controller_Action
             }
         } catch (Exception $e) {
             Logging::debug($e->getMessage());
-            $this->view->statusMessage = "<div class='errors'>_(Invalid form values.)</div>";
+            $this->view->statusMessage = "<div class='errors'>"._("Invalid form values.")."</div>";
             $this->view->streamId = -1;
             $this->view->analysis = $analysis;
         }

From ef626a71b1595a459b6e6b3692e19832c2451aea Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 15:52:51 -0500
Subject: [PATCH 08/11] CC-1960: Internationalize Airtime / Support
 translations

-added gettext wrapper to all strings in models
---
 airtime_mvc/application/models/Auth.php       |  2 +-
 airtime_mvc/application/models/Block.php      | 64 +++++++++----------
 airtime_mvc/application/models/MusicDir.php   | 18 +++---
 airtime_mvc/application/models/Playlist.php   | 12 ++--
 airtime_mvc/application/models/Scheduler.php  | 20 +++---
 airtime_mvc/application/models/Show.php       |  8 +--
 .../application/models/ShowInstance.php       | 18 +++---
 airtime_mvc/application/models/StoredFile.php | 39 ++++++-----
 airtime_mvc/application/models/Webstream.php  | 22 +++----
 9 files changed, 102 insertions(+), 101 deletions(-)

diff --git a/airtime_mvc/application/models/Auth.php b/airtime_mvc/application/models/Auth.php
index 2aef1ce81..ff27711bd 100644
--- a/airtime_mvc/application/models/Auth.php
+++ b/airtime_mvc/application/models/Auth.php
@@ -30,7 +30,7 @@ class Application_Model_Auth
         $e_link_port = $_SERVER['SERVER_PORT'];
         $e_link_path = $view->url(array('user_id' => $user->getDbId(), 'token' => $token), 'password-change');
 
-        $message = "Hi {$user->getDbLogin()}, \n\nClick this link to reset your password: ";
+        $message = sprintf(_("Hi %s, \n\nClick this link to reset your password: "), $user->getDbLogin());
         $message .= "{$e_link_protocol}://{$e_link_base}:{$e_link_port}{$e_link_path}";
 
         $success = Application_Model_Email::send('Airtime Password Reset', $message, $user->getDbEmail());
diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index c41bc579f..f3ff7bf12 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -754,7 +754,7 @@ SQL;
 
         try {
             if (is_null($cueIn) && is_null($cueOut)) {
-                $errArray["error"] = "Cue in and cue out are null.";
+                $errArray["error"] = _("Cue in and cue out are null.");
 
                 return $errArray;
             }
@@ -789,7 +789,7 @@ SQL;
                 );
                 $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
                 if ($result) {
-                    $errArray["error"] = "Can't set cue out to be greater than file length.";
+                    $errArray["error"] = _("Can't set cue out to be greater than file length.");
                     return $errArray;
                 }
 
@@ -800,7 +800,7 @@ SQL;
                 );
                 $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
                 if ($result) {
-                    $errArray["error"] = "Can't set cue in to be larger than cue out.";
+                    $errArray["error"] = _("Can't set cue in to be larger than cue out.");
                     return $errArray;
                 }
 
@@ -821,7 +821,7 @@ SQL;
                 );
                 $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
                 if ($result) {
-                    $errArray["error"] = "Can't set cue in to be larger than cue out.";
+                    $errArray["error"] = _("Can't set cue in to be larger than cue out.");
                     return $errArray;
                 }
 
@@ -845,7 +845,7 @@ SQL;
                 );
                 $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
                 if ($result) {
-                    $errArray["error"] = "Can't set cue out to be greater than file length.";
+                    $errArray["error"] = _("Can't set cue out to be greater than file length.");
                     return $errArray;
                 }
 
@@ -856,7 +856,7 @@ SQL;
                 );
                 $result = Application_Common_Database::prepareAndExecute($sql, $params, 'column');
                 if ($result) {
-                    $errArray["error"] = "Can't set cue out to be smaller than cue in.";
+                    $errArray["error"] = _("Can't set cue out to be smaller than cue in.");
                     return $errArray;
                 }
 
@@ -1204,32 +1204,32 @@ SQL;
     public function getCriteria()
     {
         $criteriaOptions = array(
-                0              => "Select criteria",
-                "album_title"  => "Album",
-                "bit_rate"     => "Bit Rate (Kbps)",
-                "bpm"          => "BPM",
-                "composer"     => "Composer",
-                "conductor"    => "Conductor",
-                "copyright"    => "Copyright",
-                "artist_name"  => "Creator",
-                "encoded_by"   => "Encoded By",
-                "genre"        => "Genre",
-                "isrc_number"  => "ISRC",
-                "label"        => "Label",
-                "language"     => "Language",
-                "mtime"        => "Last Modified",
-                "lptime"       => "Last Played",
-                "length"       => "Length",
-                "mime"         => "Mime",
-                "mood"         => "Mood",
-                "owner_id"     => "Owner",
-                "replay_gain"  => "Replay Gain",
-                "sample_rate"  => "Sample Rate (kHz)",
-                "track_title"  => "Title",
-                "track_number" => "Track Number",
-                "utime"        => "Uploaded",
-                "info_url"     => "Website",
-                "year"         => "Year"
+            0              => _("Select criteria"),
+            "album_title"  => _("Album"),
+            "bit_rate"     => _("Bit Rate (Kbps)"),
+            "bpm"          => _("BPM"),
+            "composer"     => _("Composer"),
+            "conductor"    => _("Conductor"),
+            "copyright"    => _("Copyright"),
+            "artist_name"  => _("Creator"),
+            "encoded_by"   => _("Encoded By"),
+            "genre"        => _("Genre"),
+            "isrc_number"  => _("ISRC"),
+            "label"        => _("Label"),
+            "language"     => _("Language"),
+            "mtime"        => _("Last Modified"),
+            "lptime"       => _("Last Played"),
+            "length"       => _("Length"),
+            "mime"         => _("Mime"),
+            "mood"         => _("Mood"),
+            "owner_id"     => _("Owner"),
+            "replay_gain"  => _("Replay Gain"),
+            "sample_rate"  => _("Sample Rate (kHz)"),
+            "track_title"  => _("Title"),
+            "track_number" => _("Track Number"),
+            "utime"        => _("Uploaded"),
+            "info_url"     => _("Website"),
+            "year"         => _("Year")
         );
 
         // Load criteria from db
diff --git a/airtime_mvc/application/models/MusicDir.php b/airtime_mvc/application/models/MusicDir.php
index 6ace56550..f26b33522 100644
--- a/airtime_mvc/application/models/MusicDir.php
+++ b/airtime_mvc/application/models/MusicDir.php
@@ -157,15 +157,15 @@ SQL;
             $diff = strlen($dir) - strlen($p_path);
             if ($diff == 0) {
                 if ($dir == $p_path) {
-                    throw new NestedDirectoryException("'$p_path' is already watched.");
+                    throw new NestedDirectoryException(sprintf(_("%s is already watched."), $p_path));
                 }
             } elseif ($diff > 0) {
                 if (self::isAncestorDir($p_path, $dir)) {
-                    throw new NestedDirectoryException("'$p_path' contains nested watched directory: '$dir'");
+                    throw new NestedDirectoryException(sprintf(_("%s contains nested watched directory: %s"), $p_path, $dir));
                 }
             } else { /* diff < 0*/
                 if (self::isAncestorDir($dir, $p_path)) {
-                    throw new NestedDirectoryException("'$p_path' is nested within existing watched directory: '$dir'");
+                    throw new NestedDirectoryException(sprintf(_("%s is nested within existing watched directory: %s"), $p_path, $dir));
                 }
             }
         }
@@ -186,7 +186,7 @@ SQL;
     public static function addDir($p_path, $p_type, $userAddedWatchedDir=true, $nestedWatch=false)
     {
         if (!is_dir($p_path)) {
-            return array("code"=>2, "error"=>"'$p_path' is not a valid directory.");
+            return array("code"=>2, "error"=>sprintf(_("%s is not a valid directory."), $p_path));
         }
         $real_path = Application_Common_OsPath::normpath($p_path)."/";
         if ($real_path != "/") {
@@ -227,7 +227,8 @@ SQL;
 
             return array("code"=>1, "error"=>"$msg");
         } catch (Exception $e) {
-            return array("code"=>1, "error"=>"'$p_path' is already set as the current storage dir or in the watched folders list");
+            return array("code"=>1,
+                         "error"=>sprintf(_("%s is already set as the current storage dir or in the watched folders list"), $p_path));
         }
 
     }
@@ -359,7 +360,7 @@ SQL;
         // path should always ends with trailing '/'
         $p_dir = Application_Common_OsPath::normpath($p_dir)."/";
         if (!is_dir($p_dir)) {
-            return array("code"=>2, "error"=>"'$p_dir' is not a valid directory.");
+            return array("code"=>2, "error"=>sprintf(_("%s is not a valid directory."), $p_dir));
         } elseif (Application_Model_Preference::GetImportTimestamp()+10 > time()) {
             return array("code"=>3, "error"=>"Airtime is currently importing files. Please wait until this is complete before changing the storage directory.");
         }
@@ -376,7 +377,8 @@ SQL;
 
             return array("code"=>0);
         } else {
-            return array("code"=>1, "error"=>"'$p_dir' is already set as the current storage dir or in the watched folders list.");
+            return array("code"=>1,
+                "error"=>sprintf(_("%s is already set as the current storage dir or in the watched folders list."), $p_dir));
         }
     }
 
@@ -419,7 +421,7 @@ SQL;
         }
         $dir = Application_Model_MusicDir::getDirByPath($p_dir);
         if (is_null($dir)) {
-            return array("code"=>1, "error"=>"'$p_dir' doesn't exist in the watched list.");
+            return array("code"=>1, "error"=>sprintf(_("%s doesn't exist in the watched list."), $p_dir));
         } else {
             $dir->remove($userAddedWatchedDir);
             $data = array();
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 8abf649d1..b1b5879bc 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -721,7 +721,7 @@ SQL;
 
         try {
             if (is_null($cueIn) && is_null($cueOut)) {
-                $errArray["error"] = "Cue in and cue out are null.";
+                $errArray["error"] = _("Cue in and cue out are null.");
 
                 return $errArray;
             }
@@ -751,14 +751,14 @@ SQL;
 
                 $sql = "SELECT :cueIn::INTERVAL > :cueOut::INTERVAL";
                 if (Application_Common_Database::prepareAndExecute($sql, array(':cueIn'=>$cueIn, ':cueOut'=>$cueOut), 'column')) {
-                    $errArray["error"] = "Can't set cue in to be larger than cue out.";
+                    $errArray["error"] = _("Can't set cue in to be larger than cue out.");
 
                     return $errArray;
                 }
 
                 $sql = "SELECT :cueOut::INTERVAL > :origLength::INTERVAL";
                 if (Application_Common_Database::prepareAndExecute($sql, array(':cueOut'=>$cueOut, ':origLength'=>$origLength), 'column')) {
-                    $errArray["error"] = "Can't set cue out to be greater than file length.";
+                    $errArray["error"] = _("Can't set cue out to be greater than file length.");
 
                     return $errArray;
                 }
@@ -774,7 +774,7 @@ SQL;
 
                 $sql = "SELECT :cueIn::INTERVAL > :oldCueOut::INTERVAL";
                 if (Application_Common_Database::prepareAndExecute($sql, array(':cueIn'=>$cueIn, ':oldCueOut'=>$oldCueOut), 'column')) {
-                    $errArray["error"] = "Can't set cue in to be larger than cue out.";
+                    $errArray["error"] = _("Can't set cue in to be larger than cue out.");
 
                     return $errArray;
                 }
@@ -792,14 +792,14 @@ SQL;
 
                 $sql = "SELECT :cueOut::INTERVAL < :oldCueIn::INTERVAL";
                 if (Application_Common_Database::prepareAndExecute($sql, array(':cueOut'=>$cueOut, ':oldCueIn'=>$oldCueIn), 'column')) {
-                    $errArray["error"] = "Can't set cue out to be smaller than cue in.";
+                    $errArray["error"] = _("Can't set cue out to be smaller than cue in.");
 
                     return $errArray;
                 }
 
                 $sql = "SELECT :cueOut::INTERVAL > :origLength::INTERVAL";
                 if (Application_Common_Database::prepareAndExecute($sql, array(':cueOut'=>$cueOut, ':origLength'=>$origLength), 'column')) {
-                    $errArray["error"] = "Can't set cue out to be greater than file length.";
+                    $errArray["error"] = _("Can't set cue out to be greater than file length.");
 
                     return $errArray;
                 }
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index b36fc2223..fb5c2ebc4 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -79,12 +79,12 @@ class Application_Model_Scheduler
 
         //an item has been deleted
         if (count($schedIds) !== count($schedItems)) {
-            throw new OutDatedScheduleException("The schedule you're viewing is out of date! (sched mismatch)");
+            throw new OutDatedScheduleException(_("The schedule you're viewing is out of date! (sched mismatch)"));
         }
 
         //a show has been deleted
         if (count($instanceIds) !== count($showInstances)) {
-            throw new OutDatedScheduleException("The schedule you're viewing is out of date! (instance mismatch)");
+            throw new OutDatedScheduleException(_("The schedule you're viewing is out of date! (instance mismatch)"));
         }
 
         foreach ($schedItems as $schedItem) {
@@ -92,7 +92,7 @@ class Application_Model_Scheduler
             $instance = $schedItem->getCcShowInstances($this->con);
 
             if (intval($schedInfo[$id]) !== $instance->getDbId()) {
-                throw new OutDatedScheduleException("The schedule you're viewing is out of date!");
+                throw new OutDatedScheduleException(_("The schedule you're viewing is out of date!"));
             }
         }
 
@@ -102,24 +102,24 @@ class Application_Model_Scheduler
             $show = $instance->getCcShow($this->con);
 
             if ($this->checkUserPermissions && $this->user->canSchedule($show->getDbId()) === false) {
-                throw new Exception("You are not allowed to schedule show {$show->getDbName()}.");
+                throw new Exception(sprintf(_("You are not allowed to schedule show %s."), $show->getDbName()));
             }
             
             if ($instance->getDbRecord()) {
-                throw new Exception("You cannot add files to recording shows.");
+                throw new Exception(_("You cannot add files to recording shows."));
             }
 
             $showEndEpoch = floatval($instance->getDbEnds("U.u"));
 
             if ($showEndEpoch < $nowEpoch) {
-                throw new OutDatedScheduleException("The show {$show->getDbName()} is over and cannot be scheduled.");
+                throw new OutDatedScheduleException(sprintf(_("The show %s is over and cannot be scheduled."), $show->getDbName()));
             }
 
             $ts = intval($instanceInfo[$id]);
             $lastSchedTs = intval($instance->getDbLastScheduled("U")) ? : 0;
             if ($ts < $lastSchedTs) {
                 Logging::info("ts {$ts} last sched {$lastSchedTs}");
-                throw new OutDatedScheduleException("The show {$show->getDbName()} has been previously updated!");
+                throw new OutDatedScheduleException(sprintf(_("The show %s has been previously updated!"), $show->getDbName()));
             }
         }
     }
@@ -138,7 +138,7 @@ class Application_Model_Scheduler
             $file = CcFilesQuery::create()->findPK($id, $this->con);
 
             if (is_null($file) || !$file->visible()) {
-                throw new Exception("A selected File does not exist!");
+                throw new Exception(_("A selected File does not exist!"));
             } else {
                 $data = $this->fileInfo;
                 $data["id"] = $id;
@@ -219,7 +219,7 @@ class Application_Model_Scheduler
              $stream = CcWebstreamQuery::create()->findPK($id, $this->con);
 
             if (is_null($stream) /* || !$file->visible() */) {
-                throw new Exception("A selected File does not exist!");
+                throw new Exception(_("A selected File does not exist!"));
             } else {
                 $data = $this->fileInfo;
                 $data["id"] = $id;
@@ -343,7 +343,7 @@ class Application_Model_Scheduler
 
         $instance = CcShowInstancesQuery::create()->findPK($showInstance, $this->con);
         if (is_null($instance)) {
-            throw new OutDatedScheduleException("The schedule you're viewing is out of date!");
+            throw new OutDatedScheduleException(_("The schedule you're viewing is out of date!"));
         }
 
         $itemStartDT = $instance->getDbStarts(null);
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 6f088046d..7f55e8c2a 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -177,7 +177,7 @@ SQL;
         $con = Propel::getConnection();
 
         if ($deltaDay > 0) {
-            return "Shows can have a max length of 24 hours.";
+            return _("Shows can have a max length of 24 hours.");
         }
         
         $utc = new DateTimeZone("UTC");
@@ -208,7 +208,7 @@ SQL;
             $newEndsDateTime   = Application_Model_ShowInstance::addDeltas($endsDateTime, $deltaDay, $deltaMin);
             
             if ($newEndsDateTime->getTimestamp() < $nowDateTime->getTimestamp()) {
-                return "End date/time cannot be in the past";
+                return _("End date/time cannot be in the past");
             }
 
             //convert our new starts/ends to UTC.
@@ -219,8 +219,8 @@ SQL;
                 $newStartsDateTime, $newEndsDateTime, true, $si->getDbId());
 
             if ($overlapping) {
-                return "Cannot schedule overlapping shows.\nNote: Resizing a repeating show ".
-                       "affects all of its repeats.";
+                return _("Cannot schedule overlapping shows.\nNote: Resizing a repeating show ".
+                       "affects all of its repeats.");
             }
         }
 
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index e1cdbe5b6..9a5e8a7d4 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -242,7 +242,7 @@ SQL;
     public function moveShow($deltaDay, $deltaMin)
     {
         if ($this->getShow()->isRepeating()) {
-            return "Can't drag and drop repeating shows";
+            return _("Can't drag and drop repeating shows");
         }
 
         $today_timestamp = time();
@@ -250,7 +250,7 @@ SQL;
         $endsDateTime = new DateTime($this->getShowInstanceEnd(), new DateTimeZone("UTC"));
 
         if ($today_timestamp > $startsDateTime->getTimestamp()) {
-            return "Can't move a past show";
+            return _("Can't move a past show");
         }
 
         //the user is moving the show on the calendar from the perspective of local time.
@@ -267,13 +267,13 @@ SQL;
         $newEndsDateTime->setTimezone(new DateTimeZone("UTC"));
 
         if ($today_timestamp > $newStartsDateTime->getTimestamp()) {
-            return "Can't move show into past";
+            return _("Can't move show into past");
         }
 
         //check if show is overlapping
         $overlapping = Application_Model_Schedule::checkOverlappingShows($newStartsDateTime, $newEndsDateTime, true, $this->getShowInstanceId());
         if ($overlapping) {
-            return "Cannot schedule overlapping shows";
+            return _("Cannot schedule overlapping shows");
         }
 
         if ($this->isRecorded()) {
@@ -287,7 +287,7 @@ SQL;
                 ->find();
 
             if (count($rebroadcasts) > 0) {
-                return "Can't move a recorded show less than 1 hour before its rebroadcasts.";
+                return _("Can't move a recorded show less than 1 hour before its rebroadcasts.");
             }
         }
 
@@ -300,14 +300,14 @@ SQL;
             catch (Exception $e) {
                 $this->_showInstance->delete();
 
-                return "Show was deleted because recorded show does not exist!";
+                return _("Show was deleted because recorded show does not exist!");
             }
 
             $recordEndDateTime = new DateTime($recordedShow->getShowInstanceEnd(), new DateTimeZone("UTC"));
             $newRecordEndDateTime = self::addDeltas($recordEndDateTime, 0, 60);
 
             if ($newStartsDateTime->getTimestamp() < $newRecordEndDateTime->getTimestamp()) {
-                return "Must wait 1 hour to rebroadcast.";
+                return _("Must wait 1 hour to rebroadcast.");
             }
         }
 
@@ -339,7 +339,7 @@ SQL;
         $ends            = $this->getShowInstanceEnd();
 
         if (strtotime($today_timestamp) > strtotime($starts)) {
-            return "can't resize a past show";
+            return _("can't resize a past show");
         }
 
         //$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'";
@@ -361,7 +361,7 @@ SQL;
 
             if (count($overlap) > 0) {
                 // TODO : fix ghetto error handling -- RG
-                return "Should not overlap shows";
+                return _("Should not overlap shows");
             }
         }
         //with overbooking no longer need to check already scheduled content still fits.
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 8be6cd639..508e7eb3b 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -794,14 +794,14 @@ SQL;
             // ugly
             if ($type == "au") {
                 $row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION);
-                $row['image'] = '<img title="Track preview" src="'.$baseUrl.'/css/images/icon_audioclip.png">';
+                $row['image'] = '<img title="'._("Track preview").'" src="'.$baseUrl.'/css/images/icon_audioclip.png">';
             } elseif ($type == "pl") {
-                $row['image'] = '<img title="Playlist preview" src="'.$baseUrl.'/css/images/icon_playlist.png">';
+                $row['image'] = '<img title="'._("Playlist preview").'" src="'.$baseUrl.'/css/images/icon_playlist.png">';
             } elseif ($type == "st") {
                 $row['audioFile'] = $row['id'];
-                $row['image'] = '<img title="Webstream preview" src="'.$baseUrl.'/css/images/icon_webstream.png">';
+                $row['image'] = '<img title="'._("Webstream preview").'" src="'.$baseUrl.'/css/images/icon_webstream.png">';
             } elseif ($type == "bl") {
-                $row['image'] = '<img title="Smart Block" src="'.$baseUrl.'/css/images/icon_smart-block.png">';
+                $row['image'] = '<img title="'._("Smart Block").'" src="'.$baseUrl.'/css/images/icon_smart-block.png">';
             }
         }
 
@@ -853,7 +853,7 @@ SQL;
 
             closedir($dir);
         } else
-            die('{"jsonrpc" : "2.0", "error" : {"code": 100, "message": "Failed to open temp directory."}, "id" : "id"}');
+            die('{"jsonrpc" : "2.0", "error" : {"code": 100, "message": _("Failed to open temp directory.")}, "id" : "id"}');
 
         // Look for the content type header
         if (isset($_SERVER["HTTP_CONTENT_TYPE"]))
@@ -880,14 +880,14 @@ SQL;
                         while ($buff = fread($in, 4096))
                             fwrite($out, $buff);
                     } else
-                        die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
+                        die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": _("Failed to open input stream.")}, "id" : "id"}');
 
                     fclose($out);
                     unlink($_FILES['file']['tmp_name']);
                 } else
-                    die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
+                    die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": _("Failed to open output stream.")}, "id" : "id"}');
             } else
-                die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}');
+                die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": _("Failed to move uploaded file.")}, "id" : "id"}');
         } else {
             // Open temp file
             $out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab");
@@ -899,11 +899,11 @@ SQL;
                     while ($buff = fread($in, 4096))
                         fwrite($out, $buff);
                 } else
-                    die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}');
+                    die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": _("Failed to open input stream.")}, "id" : "id"}');
 
                 fclose($out);
             } else
-                die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}');
+                die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": _("Failed to open output stream.")}, "id" : "id"}');
         }
 
         return $tempFilePath;
@@ -934,7 +934,7 @@ SQL;
             if (!mkdir($stor."/organize", 0777)) {
                 return array(
                     "code"    => 109,
-                    "message" => "Failed to create 'organize' directory.");
+                    "message" => _("Failed to create 'organize' directory."));
             }
         }
 
@@ -947,17 +947,17 @@ SQL;
             $freeSpace = disk_free_space($stor);
 
             return array("code" => 107,
-                "message" => "The file was not uploaded, there is
-                ".$freeSpace."MB of disk space left and the file you are
-                uploading has a size of  ".$fileSize."MB.");
+                "message" => sprintf(_("The file was not uploaded, there is "
+                ."%s MB of disk space left and the file you are "
+                ."uploading has a size of %s MB."), $freeSpace, $fileSize));
         }
 
         // Check if liquidsoap can play this file
         if (!self::liquidsoapFilePlayabilityTest($audio_file)) {
             return array(
                 "code"    => 110,
-                "message" => "This file appears to be corrupted and will not
-                be added to media library.");
+                "message" => _("This file appears to be corrupted and will not "
+                ."be added to media library."));
         }
 
         // Did all the checks for real, now trying to copy
@@ -992,10 +992,9 @@ SQL;
 
             return array(
                 "code"    => 108,
-                "message" => "
-                The file was not uploaded, this error can occur if the computer
-                hard drive does not have enough disk space or the stor
-                directory does not have correct write permissions.");
+                "message" => _("The file was not uploaded, this error can occur if the computer "
+                ."hard drive does not have enough disk space or the stor "
+                ."directory does not have correct write permissions."));
         }
         // Now that we successfully added this file, we will add another tag
         // file that will identify the user that owns it
diff --git a/airtime_mvc/application/models/Webstream.php b/airtime_mvc/application/models/Webstream.php
index ef3f32605..9297cb1d9 100644
--- a/airtime_mvc/application/models/Webstream.php
+++ b/airtime_mvc/application/models/Webstream.php
@@ -154,12 +154,12 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
 
             if ($totalMinutes == 0) {
                 $valid['length'][0] = false;
-                $valid['length'][1] = 'Length needs to be greater than 0 minutes';
+                $valid['length'][1] = _('Length needs to be greater than 0 minutes');
             }
 
         } else {
             $valid['length'][0] = false;
-            $valid['length'][1] = 'Length should be of form "00h 00m"';
+            $valid['length'][1] = _('Length should be of form "00h 00m"');
         }
 
         $url = $parameters["url"];
@@ -172,16 +172,16 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
         $mediaUrl = null;
         if ($result == 0) {
             $valid['url'][0] = false;
-            $valid['url'][1] = 'URL should be of form "http://domain"';
+            $valid['url'][1] = _('URL should be of form "http://domain"');
         } elseif (strlen($url) > 512) {
             $valid['url'][0] = false;
-            $valid['url'][1] = 'URL should be 512 characters or less';
+            $valid['url'][1] = _('URL should be 512 characters or less');
         } else {
 
             try {
                 list($mime, $content_length_found) = self::discoverStreamMime($url);
                 if (is_null($mime)) {
-                    throw new Exception("No MIME type found for webstream.");
+                    throw new Exception(_("No MIME type found for webstream."));
                 }
                 $mediaUrl = self::getMediaUrl($url, $mime, $content_length_found);
 
@@ -197,7 +197,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
         $name = $parameters["name"];
         if (strlen($name) == 0) {
             $valid['name'][0] = false;
-            $valid['name'][1] = 'Webstream name cannot be empty';
+            $valid['name'][1] = _('Webstream name cannot be empty');
         }
 
         $id = $parameters["id"];
@@ -266,7 +266,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             }
         }
 
-        throw new Exception("Could not parse XSPF playlist");
+        throw new Exception(_("Could not parse XSPF playlist"));
     }
     
     private static function getPlsUrl($url)
@@ -278,7 +278,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             return $ini["playlist"]["File1"];
         }
 
-        throw new Exception("Could not parse PLS playlist");
+        throw new Exception(_("Could not parse PLS playlist"));
     }
 
     private static function getM3uUrl($url)
@@ -297,7 +297,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             return $lines[0];
         }
 
-        throw new Exception("Could not parse M3U playlist");
+        throw new Exception(_("Could not parse M3U playlist"));
     }
 
     private static function getMediaUrl($url, $mime, $content_length_found)
@@ -311,11 +311,11 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
             $media_url = self::getPlsUrl($url);
         } elseif (preg_match("/(mpeg|ogg)/", $mime)) {
             if ($content_length_found) {
-                throw new Exception("Invalid webstream - This appears to be a file download.");
+                throw new Exception(_("Invalid webstream - This appears to be a file download."));
             }
             $media_url = $url;
         } else {
-            throw new Exception("Unrecognized stream type: $mime");
+            throw new Exception(sprintf(_("Unrecognized stream type: %s"), $mime));
         }
 
         return $media_url;

From 3f3b939ebe7c2973d800aa243d93d0a5bfb04c5c Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Thu, 15 Nov 2012 17:28:18 -0500
Subject: [PATCH 09/11] -extra quote typo

---
 airtime_mvc/application/views/scripts/form/showbuilder.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index c4c344e10..af6791714 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -9,7 +9,7 @@
     <fieldset class="padded display_field push-down-8 closed">
         <legend style="cursor: pointer;">
         	<span class="ui-icon ui-icon-triangle-2-n-s"></span>
-        <?php echo _("Filter By Show:")?>"
+        <?php echo _("Filter By Show:")?>
         </legend>
 
         <div class="sb-options-form">

From 97e94269c541a0bbcb93e454335fefbc40837702 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Fri, 16 Nov 2012 13:59:51 -0500
Subject: [PATCH 10/11] CC-1960: Internationalize Airtime / Support
 translations

-added gettext function to strings in layout/scripts
---
 airtime_mvc/application/layouts/scripts/audio-player.phtml | 2 +-
 airtime_mvc/application/layouts/scripts/bare.phtml         | 2 +-
 airtime_mvc/application/layouts/scripts/layout.phtml       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/layouts/scripts/audio-player.phtml b/airtime_mvc/application/layouts/scripts/audio-player.phtml
index 85f5a7166..cb7f97740 100644
--- a/airtime_mvc/application/layouts/scripts/audio-player.phtml
+++ b/airtime_mvc/application/layouts/scripts/audio-player.phtml
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>Audio Player</title>
+    <title><?php echo _("Audio Player")?></title>
     <?php echo $this->headScript() ?>
     <?php echo $this->headLink() ?>
     <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
diff --git a/airtime_mvc/application/layouts/scripts/bare.phtml b/airtime_mvc/application/layouts/scripts/bare.phtml
index b89443505..0f4a1b4ee 100644
--- a/airtime_mvc/application/layouts/scripts/bare.phtml
+++ b/airtime_mvc/application/layouts/scripts/bare.phtml
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title>Live stream</title>
+	<title><?php echo _("Live stream") ?></title>
     <?php echo $this->headScript() ?>
     <?php echo $this->headLink() ?>
     <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index b25b8c9cf..80951b748 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -23,7 +23,7 @@
     $this->navigation()->menu()->setPartial($partial); ?>
     <div class="personal-block solo">
         <ul>
-          <li><span class="name"><?php echo $this->loggedInAs()?></span> | <a href=<?php echo $baseUrl . "/Login/logout"?>>Logout</a></li>
+          <li><span class="name"><?php echo $this->loggedInAs()?></span> | <a href=<?php echo $baseUrl . "/Login/logout"?>><?php echo _("Logout")?></a></li>
         </ul>
     </div>
 

From 8c49540d3d776f87833092324988269e1cd6e1e9 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Tue, 20 Nov 2012 11:16:10 -0500
Subject: [PATCH 11/11] CC-1960: Internationalize Airtime / Support
 translations

-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
---
 airtime_mvc/application/Bootstrap.php         |   3 +
 airtime_mvc/application/configs/ACL.php       |   4 +-
 .../controllers/LocaleController.php          | 262 ++++++++++++++++++
 .../public/js/airtime/common/common.js        |   2 +-
 .../public/js/airtime/dashboard/dashboard.js  |  14 +-
 .../js/airtime/dashboard/versiontooltip.js    |   8 +-
 .../library/events/library_playlistbuilder.js |  14 +-
 .../library/events/library_showbuilder.js     |   4 +-
 .../public/js/airtime/library/library.js      |  99 +++----
 .../public/js/airtime/library/plupload.js     |   4 +-
 airtime_mvc/public/js/airtime/library/spl.js  |  24 +-
 .../js/airtime/listenerstat/listenerstat.js   |   4 +-
 .../public/js/airtime/nowplaying/register.js  |   8 +-
 .../js/airtime/playlist/smart_blockbuilder.js |  43 ++-
 .../js/airtime/playouthistory/historytable.js |  12 +-
 .../js/airtime/preferences/musicdirs.js       |  14 +-
 .../js/airtime/preferences/streamsetting.js   |  28 +-
 .../js/airtime/preferences/support-setting.js |   2 +-
 .../public/js/airtime/schedule/add-show.js    |  10 +-
 .../schedule/full-calendar-functions.js       |  36 +--
 .../public/js/airtime/schedule/schedule.js    |  16 +-
 .../public/js/airtime/showbuilder/builder.js  |  56 ++--
 .../js/airtime/showbuilder/main_builder.js    |   2 +-
 .../public/js/airtime/status/status.js        |   4 +-
 airtime_mvc/public/js/airtime/user/user.js    |   8 +-
 25 files changed, 472 insertions(+), 209 deletions(-)
 create mode 100644 airtime_mvc/application/controllers/LocaleController.php

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index f670353fa..06226cb8f 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -102,6 +102,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
         $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
         $view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $view->headScript()->appendFile($baseUrl.'/js/bootstrap/bootstrap.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/js/i18n/jquery.i18n.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
+        $view->headScript()->appendFile($baseUrl.'/locale/translation-table?'.$CC_CONFIG['airtime_version'].rand(5, 10),'text/javascript');
+        $view->headScript()->appendScript("$.i18n.setDictionary(lang_dict)");
         $view->headScript()->appendScript("var baseUrl='$baseUrl'");
         
         //scripts for now playing bar
diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php
index 6687011a4..46ec0c6a3 100644
--- a/airtime_mvc/application/configs/ACL.php
+++ b/airtime_mvc/application/configs/ACL.php
@@ -26,7 +26,8 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('listenerstat'))
       ->add(new Zend_Acl_Resource('usersettings'))
       ->add(new Zend_Acl_Resource('audiopreview'))
-      ->add(new Zend_Acl_Resource('webstream'));
+      ->add(new Zend_Acl_Resource('webstream'))
+      ->add(new Zend_Acl_Resource('locale'));
 
 /** Creating permissions */
 $ccAcl->allow('G', 'index')
@@ -38,6 +39,7 @@ $ccAcl->allow('G', 'index')
       ->allow('G', 'dashboard')
       ->allow('G', 'audiopreview')
       ->allow('G', 'webstream')
+      ->allow('G', 'locale')
       ->allow('H', 'preference', 'is-import-in-progress')
       ->allow('H', 'usersettings')
       ->allow('H', 'plupload')
diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php
new file mode 100644
index 000000000..7f5ecc805
--- /dev/null
+++ b/airtime_mvc/application/controllers/LocaleController.php
@@ -0,0 +1,262 @@
+<?php
+
+class LocaleController extends Zend_Controller_Action
+{
+    public function init()
+    {
+        $ajaxContext = $this->_helper->getHelper('AjaxContext');
+        $ajaxContext->addActionContext('language-table', 'json')
+                    ->initContext();
+    }
+    
+    public function translationTableAction()
+    {
+        $translations = array (
+            //common/common.js
+            "Audio Player" => _("Audio Player"),
+            //dashboard/dashboard.js
+            "Recording:" => _("Recording:"),
+            "Master Stream" => _("Master Stream"),
+            "Live Stream" => _("Live Stream"),
+            "Nothing Scheduled" => _("Nothing Scheduled"),
+            "Current Show:" => _("Current Show:"),
+            //dashboard/versiontooltip.js
+            "You are running the latest version" => _("You are running the latest version"),
+            "New version available: " => _("New version available: "),
+            "This version will soon be obsolete." => _("This version will soon be obsolete."),
+        	"This version is no longer supported." => _("This version is no longer supported."),
+            "Please upgrade to " => _("Please upgrade to "),
+            //library/events/library_playlistbuilder.js
+            " Add to current playlist" => _(" Add to current playlist"),
+            " Add to current smart block" => _(" Add to current smart block"),
+            "Adding 1 Item." => _("Adding 1 Item."),
+            /*****embedded variable*****/
+            "Adding " => _("Adding "),
+            " Items." => _(" Items."),
+            "You can only add tracks to smart blocks." => _("You can only add tracks to smart blocks."),
+            "You can only add tracks, smart blocks, and webstreams to playlists." => _("You can only add tracks, smart blocks, and webstreams to playlists."),
+            //library/events/library_showbuilder.js
+            "Adding 1 Item." => _("Adding 1 Item."),
+            /****string with variable*****/
+            "Adding " => _("Adding "),
+            " Items." => _(" Items."),
+            //library/library.js
+            "Select" => _("Select"),
+            "Select this page" => _("Select this page"),
+            "Deselect this page" => _("Deselect this page"),
+            "Deselect all" => _("Deselect all"),
+            "Are you sure you want to delete the selected item(s)?" => _("Are you sure you want to delete the selected item(s)?"),
+            "Title" => _("Title"),
+            "Creator" => _("Creator"),
+            "Album" => _("Album"),
+            "Bit Rate" => _("Bit Rate"),
+            "BPM" => _("BPM"),
+            "Composer" => _("Composer"),
+            "Conductor" => _("Conductor"),
+            "Copyright" => _("Copyright"),
+            "Encoded By" => _("Encoded By"),
+            "Genre" => _("Genre"),
+            "ISRC" => _("ISRC"),
+            "Label" => _("Label"),
+            "Language" => _("Language"),
+            "Last Modified" => _("Last Modified"),
+            "Last Played" => _("Last Played"),
+            "Length" => _("Length"),
+            "Mime" => _("Mime"),
+            "Mood" => _("Mood"),
+            "Owner" => _("Owner"),
+            "Replay Gain" => _("Replay Gain"),
+            "Sample Rate" => _("Sample Rate"),
+            "Track Number" => _("Track Number"),
+            "Uploaded" => _("Uploaded"),
+            "Website" => _("Webiste"),
+            "Year" => _("Year"),
+            "Loading..." => _("Loading..."),
+            "All" => _("All"),
+            "Files" => _("Files"),
+            "Playlists" => _("Playlists"),
+            "Smart Blocks" => _("Smart Blocks"),
+            "Web Streams" => _("Web Streams"),
+            "Unknown type: " => _("Unknown type: "),
+            "Are you sure you want to delete the selected item?" => _("Are you sure you want to delete the selected item?"),
+            "Uploading in progress..." => _("Uploading in progress..."),
+            "Retrieving data from the server..." => _("Retrieving data from the server..."),
+            "The soundcloud id for this file is: " => _("The soundcloud id for this file is: "),
+            "There was an error while uploading to soundcloud." => _("There was an error while uploading to soundcloud."),
+            "Error code: " => _("Error code: "),
+            "Error msg: " => _("Error msg: "),
+            "Input must be a positive number" => _("Input must be a positive number"),
+            "Input must be a number" => _("Input must be a number"),
+            "Input must be in the format: yyyy-mm-dd" => _("Input must be in the format: yyyy-mm-dd"),
+            "Input must be in the format: hh:mm:ss.t" => _("Input must be in the format: hh:mm:ss.t"),
+            //library/plupload.js
+            "You are currently uploading files." => _("You are currently uploading files."),
+            "Going to another screen will cancel the upload process." => _("Going to another screen will cancel the upload process."),
+            "Are you sure you want to leave the page?" => _("Are you sure you want to leave the page?"),
+            //library/spl.js
+            "please put in a time '00:00:00 (.0)'" => _("please put in a time '00:00:00 (.0)'"),
+            "please put in a time in seconds '00 (.0)'" => _("please put in a time in seconds '00 (.0)'"),
+            "Your browser does not support playing this file type: " => _("Your browser does not support playing this file type: "),
+            "Dynamic block is not previewable" => _("Dynamic block is not previewable"),
+            "Limit to: " => _("Limit to: "),
+            "-error" => _("-error"),
+            "Playlist saved" => _("Playlist saved"),
+            "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."
+                => _("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."),
+            //listenerstat/listenerstat.js
+            "Listener Count on" => _("Listener Count on"),
+            "You clicked point " => _("You clicked point "),
+            "in" => _("in"),
+            //nowplaying/register.js
+            "Remind me in 1 week" => _("Remind me in 1 week"),
+            "Remind me never" => _("Remind me never"),
+            "Yes, help Airtime" => _("Yes, help Airtime"),
+            "Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"),
+            //playlist/smart_blockbuilder.js
+            "A static smart block will save the criteria and generate the block content immediately. This allows you to edit and view it in the Library before adding it to a show."
+                => _("A static smart block will save the criteria and generate the block content immediately. This allows you to edit and view it in the Library before adding it to a show."),
+            "A dynamic smart block will only save the criteria. The block content will get generated upon adding it to a show. You will not be able to view and edit the content in the Library."
+                => _("A dynamic smart block will only save the criteria. The block content will get generated upon adding it to a show. You will not be able to view and edit the content in the Library."),
+            "If your criteria is too strict, Airtime may not be able to fill up the desired smart block length. Hence, if you check this option, tracks will be used more than once."
+                => _("If your criteria is too strict, Airtime may not be able to fill up the desired smart block length. Hence, if you check this option, tracks will be used more than once."),
+            "Smart block shuffled" => _("Smart block shuffled"),
+            "Smart block generated and criteria saved" => _("Smart block generated and criteria saved"),
+            "Smart block saved" => _("Smart block saved"),
+            "Processing..." => _("Processing..."),
+            "Select modifier" => _("Select modifier"),
+            "contains" => _("contains"),
+            "does not contain" => _("does not contain"),
+            "is" => _("is"),
+            "is not" => _("is not"),
+            "starts with" => _("starts with"),
+            "ends with" => _("ends with"),
+            "is greater than" => _("is greater than"),
+            "is less than" => _("is less than"),
+            "is in the range" => _("is in the range"),
+            //playouthistory/historytable.js
+            "Title" => _("Title"),
+            "Creator" => _("Creator"),
+            "Played" => _("Played"),
+            "Length" => _("Length"),
+            "Composer" => _("Composer"),
+            "Copyright" => _("Copyright"),
+            //preferences/musicdirs.js
+            "Choose Storage Folder" => _("Choose Storage Folder"),
+            "Choose Folder to Watch" => _("Choose Folder to Watch"),
+            "Are you sure you want to change the storage folder?\nThis will remove the files from your Airtime library!"
+                => _("Are you sure you want to change the storage folder?\nThis will remove the files from your Airtime library!"),
+            "Manage Media Folders" => _("Manage Media Folders"),
+            "Are you sure you want to remove the watched folder?" => _("Are you sure you want to remove the watched folder?"),
+            "This path is currently not accessible." => _("This path is currently not accessible."),
+            //preferences/streamsetting.js
+            "Connected to the streaming server" => _("Connected to the streaming server"),
+            "The stream is disabled" => _("The stream is disabled"),
+            "Getting information from the server..." => _("Getting information from the server..."),
+            "Can not connect to the streaming server" => _("Can not connect to the streaming server"),
+            "If Airtime is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151."
+                => _("If Airtime is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151."),
+            /*****embedded variable*****/
+            "For more details, please read the " => _("For more details, please read the "),
+            "Airtime manual" => _("Airtime manual"),
+            "Check this option to enable metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option."
+                => _("Check this option to enable metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option."),
+            "Check this box to automatically switch off Master/Show source upon source disconnection." => _("Check this box to automatically switch off Master/Show source upon source disconnection."),
+            "Check this box to automatically switch on Master/Show source upon source connection." => _("Check this box to automatically switch on Master/Show source upon source connection."),
+            "If your Icecast server expects a username of 'source', this field can be left blank." => _("If your Icecast server expects a username of 'source', this field can be left blank."),
+            "If your live streaming client does not ask for a username, this field should be 'source'." => _("If your live streaming client does not ask for a username, this field should be 'source'."),
+            "If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted."
+                => _("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted."),
+            //preferences/support-setting.js
+            "Image must be one of jpg, jpeg, png, or gif" => _("Image must be one of jpg, jpeg, png, or gif"),
+            //schedule/add-show.js
+            "No result found" => _("No result found"),
+            "This follows the same security pattern for the shows: only users assigned to the show can connect." => _("This follows the same security pattern for the shows: only users assigned to the show can connect."),
+            "Specify custom authentication which will work only for this show." => _("Specify custom authentication which will work only for this show."),
+            "If your live streaming client does not ask for a username, this field should be 'source'." => _("If your live streaming client does not ask for a username, this field should be 'source'."),
+            "The show instance doesn't exist anymore!" => _("The show instance doesn't exist anymore!"),
+            //schedule/full-calendar-functions
+            //already in schedule/add-show.js
+            //"The show instance doesn't exist anymore!" => _("The show instance doesn't exist anymore!"),
+            "Show" => _("Show"),
+            "Show is empty" => _("Show is empty"),
+            "1m" => _("1m"),
+            "5m" => _("5m"),
+            "10m" => _("10m"),
+            "15m" => _("15m"),
+            "30m" => _("30m"),
+            "60m" => _("60m"),
+            "Uploading in progress..." => _("Uploading in progress..."),
+            "Retreiving data from the server..." => _("Retreiving data from the server..."),
+            //already in library/library.js
+            //"The soundcloud id for this file is: " => _("The soundcloud id for this file is: "),
+            //"There was error while uploading to soundcloud." => _("There was error while uploading to soundcloud."),
+            //"Error code: " => _("Error code: "),
+            //"Error msg: " => _("Error msg: "),
+            "This show has no scheduled content." => _("This show has no scheduled content."),
+            //already in schedule/add-show.js
+            //"The show instance doesn't exist anymore!" => _("The show instance doesn't exist anymore!"),
+            //schedule/schedule.js
+            "Shows longer than their scheduled time will be cut off by a following show." => _("Shows longer than their scheduled time will be cut off by a following show."),
+            "Cancel Current Show?" => _("Cancel Current Show?"),
+            "Stop recording current show?" => _("Stop recording current show?"),
+            "Ok" => _("Ok"),
+            "Contents of Show" => _("Contents of Show"),
+            //already in schedule/add-show.js
+            //"The show instance doesn't exist anymore!" => _("The show instance doesn't exist anymore!"),
+            "Remove all content?" => _("Remove all content?"),
+            //showbuilder/builder.js
+            "Delete selected item(s)?" => _("Delete selected item(s)?"),
+            "Start" => _("Start"),
+            "End" => _("End"),
+            "Duration" => _("Duration"),
+            //already in library/library.js
+            //"Title" => _("Title"),
+            //"Creator" => _("Creator"),
+            //"Album" => _("Album"),
+            //"Mime" => _("Mime"),
+            "Cue In" => _("Cue In"),
+            "Cue Out" => _("Cue Out"),
+            "Fade In" => _("Fade In"),
+            "Fade Out" => _("Fade Out"),
+            "Show Empty" => _("Show Empty"),
+            "Recording From Line In" => _("Recording From Line In"),
+            "Track preview" => _("Track preview"),
+            //already in library/spl/js
+            //"Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."
+                //=> _("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore."),
+            "Cannot schedule outside a show." => _("Cannot schedule outside a show."),
+            /*****embedded variable*****/
+            "Moving " => _("Moving "),
+            " Item." => _(" Item."),
+            " Items." => _(" Items."),
+            //already in library/library.js
+            "Select" => _("Select"),
+            "Select all" => _("Select all"),
+            "Select none" => _("Select none"),
+            "Remove overbooked tracks" => _("Remove overbooked tracks"),
+            "Remove selected scheduled items" => _("Remove selected scheduled items"),
+            "Jump to the current playing track" => _("Jump to the current playing track"),
+            "Cancel current show" => _("Cancel current show"),
+            //already in schedule/schedule.js
+            //"Cancel Current Show?" => _("Cancel Current Show?"),
+            "Stop recording current show?" => _("Stop recording current show?"),
+            //showbuilder/main_builder.js
+            "Open library to add or remove content" => _("Open library to add or remove content"),
+            "Add / Remove Content" => _("Add / Remove Content"),
+            //status/status.js
+            "in use" => _("in use"),
+            "Disk" => _("Disk"),
+            //user/user.js
+            "Admin" => _("Admin"),
+            "DJ" => _("DJ"),
+            "Program Manager" => _("Program Manager"),
+            "Guest" => _("Guest"),
+            
+        );
+        $this->view->layout()->disableLayout();
+        $this->_helper->viewRenderer->setNoRender(true);
+        header("Content-type: text/javascript");
+        echo "var lang_dict=".json_encode($translations);
+        
+    }
+}
\ No newline at end of file
diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js
index 984b9419e..a990f82a5 100644
--- a/airtime_mvc/public/js/airtime/common/common.js
+++ b/airtime_mvc/public/js/airtime/common/common.js
@@ -104,7 +104,7 @@ function open_show_preview(p_showID, p_showIndex) {
 }
 
 function openPreviewWindow(url) {
-    _preview_window = window.open(url, 'Audio Player', 'width=450,height=100,scrollbars=yes');
+    _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=450,height=100,scrollbars=yes');
     return false;
 }
 
diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index df107ef15..1f72a76b2 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -143,24 +143,24 @@ function updatePlaybar(){
     }
     if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
         if (currentSong.record == "1")
-            $('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+",");
+            $('#current').html("<span style='color:red; font-weight:bold'>"+$.i18n._("Recording:")+"</span>"+currentSong.name+",");
         else
             $('#current').text(currentSong.name+",");
     }else{
         if (master_dj_on_air) {
             if (showName) {
-                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Master Stream</span>");
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - "+$.i18n._("Master Stream")+"</span>");
             } else {
-                $('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+$.i18n._("Master Stream")+"</span>");
             }
         } else if (live_dj_on_air) {
             if (showName) {
-                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Live Stream</span>");
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - "+$.i18n._("Live Stream")+"</span>");
             } else {
-                $('#current').html("Current: <span style='color:red; font-weight:bold'>Live Stream</span>");
+                $('#current').html("Current: <span style='color:red; font-weight:bold'>"+$.i18n._("Live Stream")+"</span>");
             }
         } else {
-            $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
+            $('#current').html("Current: <span style='color:red; font-weight:bold'>"+$.i18n._("Nothing Scheduled")+"</span>");
         }
     }
 
@@ -191,7 +191,7 @@ function updatePlaybar(){
         $('#song-length').text(convertToHHMMSSmm(currentSong.songLengthMs));
     }
     /* Column 1 update */
-    $('#playlist').text("Current Show:");
+    $('#playlist').text($.i18n._("Current Show:"));
     var recElem = $('.recording-show');
     if (currentShow.length > 0){
         $('#playlist').text(currentShow[0].name);
diff --git a/airtime_mvc/public/js/airtime/dashboard/versiontooltip.js b/airtime_mvc/public/js/airtime/dashboard/versiontooltip.js
index 10afb2864..4b6675591 100644
--- a/airtime_mvc/public/js/airtime/dashboard/versiontooltip.js
+++ b/airtime_mvc/public/js/airtime/dashboard/versiontooltip.js
@@ -8,13 +8,13 @@ function getContent() {
     var msg = "";
     // See file airtime_mvc/application/views/helpers/VersionNotify.php for more info
     if(isUpToDate()) {
-        msg = "You are running the latest version";
+        msg = $.i18n._("You are running the latest version");
     } else if (diff < 20) {  
-        msg = "New version available: " + link;
+        msg = $.i18n._("New version available: ") + link;
     } else if (diff < 30) {
-        msg = "This version will soon be obsolete.<br/>Please upgrade to " + link;
+        msg = $.i18n._("This version will soon be obsolete.")+"<br/>"+$.i18n._("Please upgrade to ") + link;
     } else {
-        msg = "This version is no longer supported.<br/>Please upgrade to " + link;
+        msg = $.i18n._("This version is no longer supported.")+"<br/>"+$.i18n._("Please upgrade to ") + link;
     }
     
     return msg;
diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
index 457b219b7..ced6d852e 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
@@ -30,11 +30,11 @@ var AIRTIME = (function(AIRTIME) {
         var objType = $('#obj_type').val(),
             btnText;
         if (objType === 'playlist') {
-            btnText = ' Add to current playlist';
+            btnText = $.i18n._(' Add to current playlist');
         } else if (objType === 'block') {
-            btnText = ' Add to current smart block';
+            btnText = $.i18n._(' Add to current smart block');
         } else {
-            btnText = ' Add to current playlist';
+            btnText = $.i18n._(' Add to current playlist');
         }
         AIRTIME.library.changeAddButtonText($('.btn-group #library-plus #lib-plus-text'), btnText);
     };
@@ -86,9 +86,9 @@ var AIRTIME = (function(AIRTIME) {
                         }
 
                         if (selected === 1) {
-                            message = "Adding 1 Item.";
+                            message = $.i18n._("Adding 1 Item.");
                         } else {
-                            message = "Adding " + selected + " Items.";
+                            message = $.i18n._("Adding ") + selected + $.i18n._(" Items.");
                         }
 
                         container = $('<div class="helper"/>').append(
@@ -158,9 +158,9 @@ var AIRTIME = (function(AIRTIME) {
                             undefined, 'after');
                 } else {
                     if ($('#obj_type').val() == 'block') {
-                        alert('You can only add tracks to smart blocks.');
+                        alert($.i18n._('You can only add tracks to smart blocks.'));
                     } else if ($('#obj_type').val() == 'playlist') {
-                        alert('You can only add tracks, smart blocks, and webstreams to playlists.');
+                        alert($.i18n._('You can only add tracks, smart blocks, and webstreams to playlists.'));
                     }
                 }
             });
diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
index ba03586d0..a0d5b4598 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -66,9 +66,9 @@ var AIRTIME = (function(AIRTIME) {
                         }
 
                         if (selected === 1) {
-                            message = "Adding 1 Item.";
+                            message = $.i18n._("Adding 1 Item.");
                         } else {
-                            message = "Adding " + selected + " Items.";
+                            message = $.i18n._("Adding ") + selected + $.i18n._(" Items.");
                         }
 
                         container = $('<div/>').attr('id',
diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js
index 3b7c956be..72980ab15 100644
--- a/airtime_mvc/public/js/airtime/library/library.js
+++ b/airtime_mvc/public/js/airtime/library/library.js
@@ -109,12 +109,12 @@ var AIRTIME = (function(AIRTIME) {
         $menu
             .append("<div class='btn-group'>" +
                         "<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
-                            "Select <span class='caret'></span>" +
+                            $.i18n._("Select")+" <span class='caret'></span>" +
                         "</button>" +
                         "<ul class='dropdown-menu'>" +
-                            "<li id='sb-select-page'><a href='#'>Select this page</a></li>" +
-                            "<li id='sb-dselect-page'><a href='#'>Deselect this page</a></li>" +
-                            "<li id='sb-dselect-all'><a href='#'>Deselect all</a></li>" +
+                            "<li id='sb-select-page'><a href='#'>"+$.i18n._("Select this page")+"</a></li>" +
+                            "<li id='sb-dselect-page'><a href='#'>"+$.i18n._("Deselect this page")+"</a></li>" +
+                            "<li id='sb-dselect-all'><a href='#'>"+$.i18n._("Deselect all")+"</a></li>" +
                         "</ul>" +
                     "</div>")
             .append("<div class='btn-group'>" +
@@ -322,7 +322,7 @@ var AIRTIME = (function(AIRTIME) {
     };
     
     mod.fnDeleteSelectedItems = function() {
-    	if (confirm('Are you sure you want to delete the selected item(s)?')) {
+    	if (confirm($.i18n._('Are you sure you want to delete the selected item(s)?'))) {
 	        var aData = AIRTIME.library.getSelectedData(),
 	            item,
 	            temp,
@@ -439,31 +439,31 @@ var AIRTIME = (function(AIRTIME) {
               /* ftype */  { "sTitle" : ""              , "mDataProp" : "ftype"        , "bSearchable" : false                 , "bVisible"    : false                   }          , 
               /* Checkbox */  { "sTitle" : ""              , "mDataProp" : "checkbox"     , "bSortable"   : false                 , "bSearchable" : false                   , "sWidth" : "25px"         , "sClass"    : "library_checkbox" }  , 
               /* Type */  { "sTitle" : ""              , "mDataProp" : "image"        , "bSearchable" : false                 , "sWidth"      : "25px"                  , "sClass" : "library_type" , "iDataSort" : 0                  }  ,
-              /* Title */  { "sTitle" : "Title"         , "mDataProp" : "track_title"  , "sClass"      : "library_title"       , "sWidth"      : "170px"                 }          , 
-              /* Creator */  { "sTitle" : "Creator"       , "mDataProp" : "artist_name"  , "sClass"      : "library_creator"     , "sWidth"      : "160px"                 }          ,  
-              /* Album */  { "sTitle" : "Album"         , "mDataProp" : "album_title"  , "sClass"      : "library_album"       , "sWidth"      : "150px"                 }          , 
-              /* Bit Rate */  { "sTitle" : "Bit Rate"      , "mDataProp" : "bit_rate"     , "bVisible"    : false                 , "sClass"      : "library_bitrate"       , "sWidth" : "80px"         }, 
-              /* BPM */  { "sTitle" : "BPM"           , "mDataProp" : "bpm"          , "bVisible"    : false                 , "sClass"      : "library_bpm"           , "sWidth" : "50px"         },
-              /* Composer */  { "sTitle" : "Composer"      , "mDataProp" : "composer"     , "bVisible"    : false                 , "sClass"      : "library_composer"      , "sWidth" : "150px"        }, 
-              /* Conductor */  { "sTitle" : "Conductor"     , "mDataProp" : "conductor"    , "bVisible"    : false                 , "sClass"      : "library_conductor"     , "sWidth" : "125px"        },
-              /* Copyright */  { "sTitle" : "Copyright"     , "mDataProp" : "copyright"    , "bVisible"    : false                 , "sClass"      : "library_copyright"     , "sWidth" : "125px"        },
-              /* Encoded */  { "sTitle" : "Encoded By"    , "mDataProp" : "encoded_by"   , "bVisible"    : false                 , "sClass"      : "library_encoded"       , "sWidth" : "150px"        }, 
-              /* Genre */  { "sTitle" : "Genre"         , "mDataProp" : "genre"        , "bVisible"    : false                 , "sClass"      : "library_genre"         , "sWidth" : "100px"        }, 
-              /* ISRC Number */  { "sTitle" : "ISRC"          , "mDataProp" : "isrc_number"  , "bVisible"    : false                 , "sClass"      : "library_isrc"          , "sWidth" : "150px"        }, 
-              /* Label */  { "sTitle" : "Label"         , "mDataProp" : "label"        , "bVisible"    : false                 , "sClass"      : "library_label"         , "sWidth" : "125px"        }, 
-              /* Language */  { "sTitle" : "Language"      , "mDataProp" : "language"     , "bVisible"    : false                 , "sClass"      : "library_language"      , "sWidth" : "125px"        }, 
-              /* Last Modified */  { "sTitle" : "Last Modified" , "mDataProp" : "mtime"        , "bVisible"    : false                 , "sClass"      : "library_modified_time" , "sWidth" : "125px"        },
-              /* Last Played */  { "sTitle" : "Last Played  " , "mDataProp" : "lptime"       , "bVisible"    : false                 , "sClass"      : "library_modified_time" , "sWidth" : "125px"        },  
-              /* Length */  { "sTitle" : "Length"        , "mDataProp" : "length"       , "sClass"      : "library_length"      , "sWidth"      : "80px"                  }          , 
-              /* Mime */  { "sTitle" : "Mime"          , "mDataProp" : "mime"         , "bVisible"    : false                 , "sClass"      : "library_mime"          , "sWidth" : "80px"         }, 
-              /* Mood */  { "sTitle" : "Mood"          , "mDataProp" : "mood"         , "bVisible"    : false                 , "sClass"      : "library_mood"          , "sWidth" : "70px"         },
-              /* Owner */  { "sTitle" : "Owner"         , "mDataProp" : "owner_id"     , "bVisible"    : false                 , "sClass"      : "library_language"      , "sWidth" : "125px"        }, 
-              /* Replay Gain */  { "sTitle" : "Replay Gain"   , "mDataProp" : "replay_gain"  , "bVisible"    : false                 , "sClass"      : "library_replay_gain"      , "sWidth" : "80px"      }, 
-              /* Sample Rate */  { "sTitle" : "Sample Rate"   , "mDataProp" : "sample_rate"  , "bVisible"    : false                 , "sClass"      : "library_sr"            , "sWidth" : "80px"         }, 
-              /* Track Number */  { "sTitle" : "Track Number"  , "mDataProp" : "track_number" , "bVisible"    : false                 , "sClass"      : "library_track"         , "sWidth" : "65px"         }, 
-              /* Upload Time */  { "sTitle" : "Uploaded"      , "mDataProp" : "utime"        , "sClass"      : "library_upload_time" , "sWidth"      : "125px"                 }          ,
-              /* Website */  { "sTitle" : "Website"       , "mDataProp" : "info_url"     , "bVisible"    : false                 , "sClass"      : "library_url"           , "sWidth" : "150px"        },
-              /* Year */  { "sTitle" : "Year"          , "mDataProp" : "year"         , "bVisible"    : false                 , "sClass"      : "library_year"          , "sWidth" : "60px"         }
+              /* Title */  { "sTitle" : $.i18n._("Title")         , "mDataProp" : "track_title"  , "sClass"      : "library_title"       , "sWidth"      : "170px"                 }          , 
+              /* Creator */  { "sTitle" : $.i18n._("Creator")       , "mDataProp" : "artist_name"  , "sClass"      : "library_creator"     , "sWidth"      : "160px"                 }          ,  
+              /* Album */  { "sTitle" : $.i18n._("Album")         , "mDataProp" : "album_title"  , "sClass"      : "library_album"       , "sWidth"      : "150px"                 }          , 
+              /* Bit Rate */  { "sTitle" : $.i18n._("Bit Rate")      , "mDataProp" : "bit_rate"     , "bVisible"    : false                 , "sClass"      : "library_bitrate"       , "sWidth" : "80px"         }, 
+              /* BPM */  { "sTitle" : $.i18n._("BPM")           , "mDataProp" : "bpm"          , "bVisible"    : false                 , "sClass"      : "library_bpm"           , "sWidth" : "50px"         },
+              /* Composer */  { "sTitle" : $.i18n._("Composer")      , "mDataProp" : "composer"     , "bVisible"    : false                 , "sClass"      : "library_composer"      , "sWidth" : "150px"        }, 
+              /* Conductor */  { "sTitle" : $.i18n._("Conductor")     , "mDataProp" : "conductor"    , "bVisible"    : false                 , "sClass"      : "library_conductor"     , "sWidth" : "125px"        },
+              /* Copyright */  { "sTitle" : $.i18n._("Copyright")     , "mDataProp" : "copyright"    , "bVisible"    : false                 , "sClass"      : "library_copyright"     , "sWidth" : "125px"        },
+              /* Encoded */  { "sTitle" : $.i18n._("Encoded By")    , "mDataProp" : "encoded_by"   , "bVisible"    : false                 , "sClass"      : "library_encoded"       , "sWidth" : "150px"        }, 
+              /* Genre */  { "sTitle" : $.i18n._("Genre")         , "mDataProp" : "genre"        , "bVisible"    : false                 , "sClass"      : "library_genre"         , "sWidth" : "100px"        }, 
+              /* ISRC Number */  { "sTitle" : $.i18n._("ISRC")          , "mDataProp" : "isrc_number"  , "bVisible"    : false                 , "sClass"      : "library_isrc"          , "sWidth" : "150px"        }, 
+              /* Label */  { "sTitle" : $.i18n._("Label")         , "mDataProp" : "label"        , "bVisible"    : false                 , "sClass"      : "library_label"         , "sWidth" : "125px"        }, 
+              /* Language */  { "sTitle" : $.i18n._("Language")      , "mDataProp" : "language"     , "bVisible"    : false                 , "sClass"      : "library_language"      , "sWidth" : "125px"        }, 
+              /* Last Modified */  { "sTitle" : $.i18n._("Last Modified") , "mDataProp" : "mtime"        , "bVisible"    : false                 , "sClass"      : "library_modified_time" , "sWidth" : "125px"        },
+              /* Last Played */  { "sTitle" : $.i18n._("Last Played") , "mDataProp" : "lptime"       , "bVisible"    : false                 , "sClass"      : "library_modified_time" , "sWidth" : "125px"        },  
+              /* Length */  { "sTitle" : $.i18n._("Length")        , "mDataProp" : "length"       , "sClass"      : "library_length"      , "sWidth"      : "80px"                  }          , 
+              /* Mime */  { "sTitle" : $.i18n._("Mime")          , "mDataProp" : "mime"         , "bVisible"    : false                 , "sClass"      : "library_mime"          , "sWidth" : "80px"         }, 
+              /* Mood */  { "sTitle" : $.i18n._("Mood")          , "mDataProp" : "mood"         , "bVisible"    : false                 , "sClass"      : "library_mood"          , "sWidth" : "70px"         },
+              /* Owner */  { "sTitle" : $.i18n._("Owner")         , "mDataProp" : "owner_id"     , "bVisible"    : false                 , "sClass"      : "library_language"      , "sWidth" : "125px"        }, 
+              /* Replay Gain */  { "sTitle" : $.i18n._("Replay Gain")   , "mDataProp" : "replay_gain"  , "bVisible"    : false                 , "sClass"      : "library_replay_gain"      , "sWidth" : "80px"      }, 
+              /* Sample Rate */  { "sTitle" : $.i18n._("Sample Rate")   , "mDataProp" : "sample_rate"  , "bVisible"    : false                 , "sClass"      : "library_sr"            , "sWidth" : "80px"         }, 
+              /* Track Number */  { "sTitle" : $.i18n._("Track Number")  , "mDataProp" : "track_number" , "bVisible"    : false                 , "sClass"      : "library_track"         , "sWidth" : "65px"         }, 
+              /* Upload Time */  { "sTitle" : $.i18n._("Uploaded")      , "mDataProp" : "utime"        , "sClass"      : "library_upload_time" , "sWidth"      : "125px"                 }          ,
+              /* Website */  { "sTitle" : $.i18n._("Website")       , "mDataProp" : "info_url"     , "bVisible"    : false                 , "sClass"      : "library_url"           , "sWidth" : "150px"        },
+              /* Year */  { "sTitle" : $.i18n._("Year")          , "mDataProp" : "year"         , "bVisible"    : false                 , "sClass"      : "library_year"          , "sWidth" : "60px"         }
               ],
                           
             "bProcessing": true,
@@ -611,7 +611,7 @@ var AIRTIME = (function(AIRTIME) {
                 // icon.
                 $(nRow).find("td:not(.library_checkbox, .library_type)").qtip({
                     content: {
-                        text: "Loading...",
+                        text: $.i18n._("Loading..."),
                         title: {
                             text: aData.track_title
                         },
@@ -725,11 +725,11 @@ var AIRTIME = (function(AIRTIME) {
             .addClass("dataTables_type")
             .append('<select name="library_display_type" />')
             .find("select")
-                .append('<option value="0">All</option>')
-                .append('<option value="1">Files</option>')
-                .append('<option value="2">Playlists</option>')
-                .append('<option value="3">Smart Blocks</option>')
-                .append('<option value="4">Web Streams</option>')
+                .append('<option value="0">'+$.i18n._("All")+'</option>')
+                .append('<option value="1">'+$.i18n._("Files")+'</option>')
+                .append('<option value="2">'+$.i18n._("Playlists")+'</option>')
+                .append('<option value="3">'+$.i18n._("Smart Blocks")+'</option>')
+                .append('<option value="4">'+$.i18n._("Web Streams")+'</option>')
                 .end()
             .change(function(ev){
                 oTable.fnDraw();
@@ -812,7 +812,7 @@ var AIRTIME = (function(AIRTIME) {
                                 AIRTIME.playlist.fnEdit(data.id, data.ftype, url);
                             }
                         } else {
-                            throw new Exception("Unknown type: " + data.ftype);
+                            throw new Exception($.i18n._("Unknown type: ") + data.ftype);
                         }
                         oItems.edit.callback = callback;
                     }
@@ -854,7 +854,7 @@ var AIRTIME = (function(AIRTIME) {
                             callback = function() {
                                 aMedia = [];
                                 aMedia.push({"id": data.id, "type": data.ftype});
-                                if (confirm('Are you sure you want to delete the selected item?')) {
+                                if (confirm($.i18n._('Are you sure you want to delete the selected item?'))) {
                                     AIRTIME.library.fnDeleteItems(aMedia);
                                 }
                             };
@@ -863,7 +863,7 @@ var AIRTIME = (function(AIRTIME) {
                             callback = function() {
                                 var media = [];
                                 
-                                if (confirm('Are you sure you want to delete the selected item?')) {
+                                if (confirm($.i18n._('Are you sure you want to delete the selected item?'))) {
                                     
                                     media.push({"id": data.id, "type": data.ftype});
                                     $.post(oItems.del.url, {format: "json", media: media }, function(json){
@@ -1010,7 +1010,7 @@ function addQtipToSCIcons(){
         if ($(this).hasClass("progress")){
             $(this).qtip({
                 content: {
-                    text: "Uploading in progress..."
+                    text: $.i18n._("Uploading in progress...")
                 },
                 position:{
                     adjust: {
@@ -1030,13 +1030,13 @@ function addQtipToSCIcons(){
         else if($(this).hasClass("soundcloud")){
             $(this).qtip({
                 content: {
-                    text: "Retrieving data from the server...",
+                    text: $.i18n._("Retrieving data from the server..."),
                     ajax: {
                         url: baseUrl+"/Library/get-upload-to-soundcloud-status",
                         type: "post",
                         data: ({format: "json", id : id, type: "file"}),
                         success: function(json, status){
-                            this.set('content.text', "The soundcloud id for this file is: "+json.sc_id);
+                            this.set('content.text', $.i18n._("The soundcloud id for this file is: ")+json.sc_id);
                         }
                     }
                 },
@@ -1057,14 +1057,15 @@ function addQtipToSCIcons(){
         }else if($(this).hasClass("sc-error")){
             $(this).qtip({
                 content: {
-                    text: "Retreiving data from the server...",
+                    text: $.i18n._("Retreiving data from the server..."),
                     ajax: {
                         url: baseUrl+"/Library/get-upload-to-soundcloud-status",
                         type: "post",
                         data: ({format: "json", id : id, type: "file"}),
                         success: function(json, status){
-                            this.set('content.text', "There was error while uploading to soundcloud.<br>"+"Error code: "+json.error_code+
-                                    "<br>"+"Error msg: "+json.error_msg+"<br>");
+                            this.set('content.text', $.i18n._("There was an error while uploading to soundcloud.")+"<br>"+
+                                    $.i18n._("Error code: ")+json.error_code+
+                                    "<br>"+$.i18n._("Error msg: ")+json.error_msg+"<br>");
                         }
                     }
                 },
@@ -1167,13 +1168,13 @@ function validateAdvancedSearch(divs) {
 function addRemoveValidationIcons(valid, field, searchTermType) {
     var title = '';
     if (searchTermType === 'i') {
-        title = 'Input must be a positive number';
+        title = $.i18n._('Input must be a positive number');
     } else if (searchTermType === 'n') {
-        title = 'Input must be a number';
+        title = $.i18n._('Input must be a number');
     } else if (searchTermType === 't') {
-        title = 'Input must be in the format: yyyy-mm-dd';
+        title = $.i18n._('Input must be in the format: yyyy-mm-dd');
     } else if (searchTermType === 'l') {
-        title = 'Input must be in the format: hh:mm:ss.t';
+        title = $.i18n._('Input must be in the format: hh:mm:ss.t');
     }
     
     var validIndicator = " <span class='checked-icon sp-checked-icon'></span>",
diff --git a/airtime_mvc/public/js/airtime/library/plupload.js b/airtime_mvc/public/js/airtime/library/plupload.js
index 89b442217..de12ed800 100644
--- a/airtime_mvc/public/js/airtime/library/plupload.js
+++ b/airtime_mvc/public/js/airtime/library/plupload.js
@@ -56,7 +56,9 @@ $(document).ready(function() {
 	
 	$(window).bind('beforeunload', function(){
 		if(uploadProgress){
-            return "You are currently uploading files.\nGoing to another screen will cancel the upload process.\nAre you sure you want to leave the page?";
+            return $.i18n._("You are currently uploading files.")+"\n"+
+            $.i18n._("Going to another screen will cancel the upload process.")+"\n"+
+            $.i18n._("Are you sure you want to leave the page?");
 		}
 	});
 
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 21a11218b..b1ac5534b 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -74,7 +74,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
         
         if (!isTimeValid(cueIn)){
-            showError(span, "please put in a time '00:00:00 (.0)'");
+            showError(span, $.i18n("please put in a time '00:00:00 (.0)'"));
             return;
         }
         $.post(url, 
@@ -111,7 +111,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
         if (!isTimeValid(cueOut)){
-            showError(span, "please put in a time '00:00:00 (.0)'");
+            showError(span, $.i18n("please put in a time '00:00:00 (.0)'"));
             return;
         }
         
@@ -150,7 +150,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
         if (!isFadeValid(fadeIn)){
-            showError(span, "please put in a time in seconds '00 (.0)'");
+            showError(span, $.i18n._("please put in a time in seconds '00 (.0)'"));
             return;
         }
 
@@ -188,7 +188,7 @@ var AIRTIME = (function(AIRTIME){
             type = $('#obj_type').val();
 
 		if (!isFadeValid(fadeOut)){
-	        showError(span, "please put in a time in seconds '00 (.0)'");
+	        showError(span, $.i18n._("please put in a time in seconds '00 (.0)'"));
 			return;
 		}
 
@@ -378,7 +378,7 @@ var AIRTIME = (function(AIRTIME){
                     } else {
                         $(value).attr("class", "big_play_disabled dark_class"); 
                         $(value).qtip({
-                           content: 'Your browser does not support playing this file type: "'+ mime +'"',
+                           content: $.i18n._("Your browser does not support playing this file type: ")+ mime,
                            show: 'mouseover',
                             hide: {
                                 delay: 500,
@@ -402,7 +402,7 @@ var AIRTIME = (function(AIRTIME){
                 if ($(value).attr('blocktype') === 'dynamic') {
                     $(value).attr("class", "big_play_disabled dark_class"); 
                     $(value).qtip({
-                       content: 'Dynamic block is not previewable',
+                       content: $.i18n._('Dynamic block is not previewable'),
                        show: 'mouseover',
                         hide: {
                             delay: 500,
@@ -483,7 +483,7 @@ var AIRTIME = (function(AIRTIME){
                                             "</li>";
                                     });
                                 }
-                                $html += "<li><br /><span class='block-item-title'>Limit to: "+data.limit.value+"  "+data.limit.modifier+"</span></li>";
+                                $html += "<li><br /><span class='block-item-title'>"+$.i18n._("Limit to: ")+data.limit.value+"  "+data.limit.modifier+"</span></li>";
                             }
                             $pl.find("#block_"+id+"_info").html($html).show();
                             mod.enableUI();
@@ -575,7 +575,7 @@ var AIRTIME = (function(AIRTIME){
 	            type = $('#obj_type').val();
 		    
 		    if (!isFadeValid(fadeIn)){
-	            showError(span, "please put in a time in seconds '00 (.0)'");
+	            showError(span, $.i18n._("please put in a time in seconds '00 (.0)'"));
 			    return;
 		    }
 
@@ -599,7 +599,7 @@ var AIRTIME = (function(AIRTIME){
 	            type = $('#obj_type').val();
 
 		    if (!isFadeValid(fadeOut)){
-	            showError(span, "please put in a time in seconds '00 (.0)'");
+	            showError(span, $.i18n._("please put in a time in seconds '00 (.0)'"));
 			    return;
 		    }
 
@@ -662,7 +662,7 @@ var AIRTIME = (function(AIRTIME){
                             var field = json.analysis[s];
                             
                             if (!field[0]) {
-                                var elemId = "#"+s+"-error";
+                                var elemId = "#"+s+$.i18n._("-error");
                                 var $div = $("#side_playlist " + elemId).text(field[1]).show();
                             }
                         }
@@ -718,7 +718,7 @@ var AIRTIME = (function(AIRTIME){
                         if (obj_type == "block") {
         	                callback(data, "save");
                         } else {
-                            $('.success').text('Playlist saved');
+                            $('.success').text($.i18n._('Playlist saved'));
                             $('.success').show();
                             setTimeout(removeSuccessMsg, 5000);
             	            dt.fnStandingRedraw();
@@ -1055,7 +1055,7 @@ var AIRTIME = (function(AIRTIME){
 		
 		$pl.find(".ui-icon-alert").qtip({
 	        content: {
-	            text: "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't \"watched\" anymore."
+	            text: $.i18n._("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't 'watched' anymore.")
 	        },
 	        position:{
 	            adjust: {
diff --git a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
index a410acf62..b33e4e51a 100644
--- a/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
+++ b/airtime_mvc/public/js/airtime/listenerstat/listenerstat.js
@@ -134,7 +134,7 @@ function plot(datasets){
                     var y = item.datapoint[1].toFixed(2);
                     
                     showTooltip(item.pageX, item.pageY,
-                                "Listener Count on '"+item.series.label + "': " + Math.floor(y));
+                                $.i18n._("Listener Count on")+" '"+item.series.label + "': " + Math.floor(y));
                 }
             }
             else {
@@ -145,7 +145,7 @@ function plot(datasets){
 
         $("#placeholder").bind("plotclick", function (event, pos, item) {
             if (item) {
-                $("#clickdata").text("You clicked point " + item.dataIndex + " in " + item.series.label + ".");
+                $("#clickdata").text($.i18n._("You clicked point ") + item.dataIndex + " "+$.i18n._("in")+" " + item.series.label + ".");
                 plot.highlight(item.series, item.datapoint);
             }
         });
diff --git a/airtime_mvc/public/js/airtime/nowplaying/register.js b/airtime_mvc/public/js/airtime/nowplaying/register.js
index c91a285b8..018252bbf 100644
--- a/airtime_mvc/public/js/airtime/nowplaying/register.js
+++ b/airtime_mvc/public/js/airtime/nowplaying/register.js
@@ -16,7 +16,7 @@ $(document).ready(function(){
         buttons: [
             {
                 id: "remind_me",
-                text: "Remind me in 1 week",
+                text: $.i18n._("Remind me in 1 week"),
                 "class": "btn",
                 click: function() {
                     var url = baseUrl+'/Usersettings/remindme';
@@ -29,7 +29,7 @@ $(document).ready(function(){
             },
             {
                 id: "remind_never",
-                text: "Remind me never",
+                text: $.i18n._("Remind me never"),
                 "class": "btn", 
                 click: function() {
                     var url =baseUrl+'/Usersettings/remindme-never';
@@ -42,7 +42,7 @@ $(document).ready(function(){
             },
             {
             	id: "help_airtime",
-            	text: "Yes, help Airtime",
+            	text: $.i18n._("Yes, help Airtime"),
             	"class": "btn",
             	click: function() {
             	    $("#register-form").submit();
@@ -129,7 +129,7 @@ $(document).ready(function(){
     		var ul, li; 
     			
     		ul = logoEl.find('.errors');
-    		li = $("<li/>").append("Image must be one of jpg, jpeg, png, or gif");
+    		li = $("<li/>").append($.i18n._("Image must be one of jpg, jpeg, png, or gif"));
     		
     		//errors ul has already been created.
     		if (ul.length > 0) {
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index f963ab9cd..4dd5c0f23 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -378,10 +378,8 @@ function setupUI() {
     
     $(".playlist_type_help_icon").qtip({
         content: {
-            text: "A static smart block will save the criteria and generate the block content immediately. " +
-                  "This allows you to edit and view it in the Library before adding it to a show.<br /><br />" +
-                  "A dynamic smart block will only save the criteria. The block content will get generated upon " +
-                  "adding it to a show. You will not be able to view and edit the content in the Library."
+            text: $.i18n._("A static smart block will save the criteria and generate the block content immediately. This allows you to edit and view it in the Library before adding it to a show.")+"<br /><br />" +
+                  $.i18n._("A dynamic smart block will only save the criteria. The block content will get generated upon adding it to a show. You will not be able to view and edit the content in the Library.")
         },
         hide: {
             delay: 500,
@@ -402,8 +400,7 @@ function setupUI() {
     
     $(".repeat_tracks_help_icon").qtip({
         content: {
-            text: "If your criteria is too strict, Airtime may not be able to fill up the desired smart block length." +
-                  " Hence, if you check this option, tracks will be used more than once."
+            text: $.i18n._("If your criteria is too strict, Airtime may not be able to fill up the desired smart block length. Hence, if you check this option, tracks will be used more than once.")
         },
         hide: {
             delay: 500,
@@ -495,9 +492,9 @@ function callback(data, type) {
         var form = $('#smart-block-form');
         if (json.result == "0") {
             if (type == 'shuffle') {
-                form.find('.success').text('Smart block shuffled');
+                form.find('.success').text($.i18n._('Smart block shuffled'));
             } else if (type == 'generate') {
-            	form.find('.success').text('Smart block generated and criteria saved');
+            	form.find('.success').text($.i18n._('Smart block generated and criteria saved'));
             	//redraw library table so the length gets updated
                 dt.fnStandingRedraw();
             }
@@ -508,7 +505,7 @@ function callback(data, type) {
         AIRTIME.playlist.fnOpenPlaylist(json);
         var form = $('#smart-block-form');
         if (json.result == "0") {
-            $('#sp-success-saved').text('Smart block saved');
+            $('#sp-success-saved').text($.i18n._('Smart block saved'));
             $('#sp-success-saved').show();
         
             //redraw library table so the length gets updated
@@ -553,7 +550,7 @@ function removeButtonCheck() {
 
 function enableLoadingIcon() {
     $("#side_playlist").block({ 
-        message: "Processing...",
+        message: $.i18n._("Processing..."),
         theme: true,
         allowBodyStretch: true,
         applyPlatformOpacityRules: false
@@ -594,20 +591,20 @@ var criteriaTypes = {
 };
 
 var stringCriteriaOptions = {
-    "0" : "Select modifier",
-    "contains" : "contains",
-    "does not contain" : "does not contain",
-    "is" : "is",
-    "is not" : "is not",
-    "starts with" : "starts with",
-    "ends with" : "ends with"
+    "0" : $.i18n._("Select modifier"),
+    "contains" : $.i18n._("contains"),
+    "does not contain" : $.i18n._("does not contain"),
+    "is" : $.i18n._("is"),
+    "is not" : $.i18n._("is not"),
+    "starts with" : $.i18n._("starts with"),
+    "ends with" : $.i18n._("ends with")
 };
     
 var numericCriteriaOptions = {
-    "0" : "Select modifier",
-    "is" : "is",
-    "is not" : "is not",
-    "is greater than" : "is greater than",
-    "is less than" : "is less than",
-    "is in the range" : "is in the range"
+    "0" : $.i18n._("Select modifier"),
+    "is" : $.i18n._("is"),
+    "is not" : $.i18n._("is not"),
+    "is greater than" : $.i18n._("is greater than"),
+    "is less than" : $.i18n._("is less than"),
+    "is in the range" : $.i18n._("is in the range")
 };
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index 321b32581..26d2ccebe 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -65,12 +65,12 @@ var AIRTIME = (function(AIRTIME) {
         oTable = historyTableDiv.dataTable( {
             
             "aoColumns": [
-               {"sTitle": "Title", "mDataProp": "title", "sClass": "his_title"}, /* Title */
-               {"sTitle": "Creator", "mDataProp": "artist", "sClass": "his_artist"}, /* Creator */
-               {"sTitle": "Played", "mDataProp": "played", "sClass": "his_artist"}, /* times played */
-               {"sTitle": "Length", "mDataProp": "length", "sClass": "his_length library_length"}, /* Length */
-               {"sTitle": "Composer", "mDataProp": "composer", "sClass": "his_composer"}, /* Composer */
-               {"sTitle": "Copyright", "mDataProp": "copyright", "sClass": "his_copyright"} /* Copyright */
+               {"sTitle": $.i18n._("Title"), "mDataProp": "title", "sClass": "his_title"}, /* Title */
+               {"sTitle": $.i18n._("Creator"), "mDataProp": "artist", "sClass": "his_artist"}, /* Creator */
+               {"sTitle": $.i18n._("Played"), "mDataProp": "played", "sClass": "his_artist"}, /* times played */
+               {"sTitle": $.i18n._("Length"), "mDataProp": "length", "sClass": "his_length library_length"}, /* Length */
+               {"sTitle": $.i18n._("Composer"), "mDataProp": "composer", "sClass": "his_composer"}, /* Composer */
+               {"sTitle": $.i18n._("Copyright"), "mDataProp": "copyright", "sClass": "his_copyright"} /* Copyright */
             ],
                           
             "bProcessing": true,
diff --git a/airtime_mvc/public/js/airtime/preferences/musicdirs.js b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
index 55e335cd6..072359492 100644
--- a/airtime_mvc/public/js/airtime/preferences/musicdirs.js
+++ b/airtime_mvc/public/js/airtime/preferences/musicdirs.js
@@ -15,7 +15,7 @@ function setWatchedDirEvents() {
         imageUrl: 'img/icons/',
         systemImageUrl: baseUrl+'/css/img/',
         handlerUrl: baseUrl+'/Preference/server-browse/format/json',
-        title: 'Choose Storage Folder',
+        title: $.i18n._('Choose Storage Folder'),
         basePath: '',
         requestMethod: 'POST',
     });
@@ -35,7 +35,7 @@ function setWatchedDirEvents() {
         imageUrl: 'img/icons/',
         systemImageUrl: baseUrl+'/css/img/',
         handlerUrl: baseUrl+'/Preference/server-browse/format/json',
-        title: 'Choose Folder to Watch',
+        title: $.i18n._('Choose Folder to Watch'),
         basePath: '',
         requestMethod: 'POST',
     });
@@ -43,7 +43,7 @@ function setWatchedDirEvents() {
     $('#storageFolder-ok').click(function(){
         var url, chosen;
         
-        if(confirm("Are you sure you want to change the storage folder?\nThis will remove the files from your Airtime library!")){
+        if(confirm($.i18n._("Are you sure you want to change the storage folder?\nThis will remove the files from your Airtime library!"))){
             url = baseUrl+"/Preference/change-stor-directory";
             chosen = $('#storageFolder').val();
 
@@ -72,7 +72,7 @@ function setWatchedDirEvents() {
 
             function(json) {
                 $("#watched-folder-section").empty();
-                $("#watched-folder-section").append("<h2>Manage Media Folders</h2>");
+                $("#watched-folder-section").append("<h2>"+$.i18n._("Manage Media Folders")+"</h2>");
                 $("#watched-folder-section").append(json.subform);
                 setWatchedDirEvents();
             });
@@ -84,7 +84,7 @@ function setWatchedDirEvents() {
     });
 
     $('.selected-item').find('.ui-icon-close').click(function(){
-        if(confirm("Are you sure you want to remove the watched folder?")){
+        if(confirm($.i18n._("Are you sure you want to remove the watched folder?"))){
             var row = $(this).parent();
             var folder = row.find('#folderPath').text();
 
@@ -95,7 +95,7 @@ function setWatchedDirEvents() {
 
                 function(json) {
                     $("#watched-folder-section").empty();
-                    $("#watched-folder-section").append("<h2>Manage Media Folders</h2>");
+                    $("#watched-folder-section").append("<h2>"+$.i18n._("Manage Media Folders")+"</h2>");
                     $("#watched-folder-section").append(json.subform);
                     setWatchedDirEvents();
                 });
@@ -108,7 +108,7 @@ $(document).ready(function() {
     setWatchedDirEvents();
     $(".ui-icon-alert").qtip({
         content: {
-            text: "This path is currently not accessible."
+            text: $.i18n._("This path is currently not accessible.")
         },
         position:{
             adjust: {
diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
index 973c66356..1362fb456 100644
--- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js
+++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js
@@ -93,13 +93,13 @@ function checkLiquidsoapStatus(){
             }
             var html;
             if(status == "OK"){
-                html = '<div class="stream-status status-good"><h3>Connected to the streaming server</h3></div>';
+                html = '<div class="stream-status status-good"><h3>'+$.i18n._("Connected to the streaming server")+'</h3></div>';
             }else if(status == "N/A"){
-                html = '<div class="stream-status status-disabled"><h3>The stream is disabled</h3></div>';
+                html = '<div class="stream-status status-disabled"><h3>'+$.i18n._("The stream is disabled")+'</h3></div>';
             }else if(status == "waiting"){
-            	html = '<div class="stream-status status-info"><h3>Getting information from the server...</h3></div>';
+            	html = '<div class="stream-status status-info"><h3>'+$.i18n._("Getting information from the server...")+'</h3></div>';
             }else{
-                html = '<div class="stream-status status-error"><h3>Can not connect to the streaming server</h3><p>'+status+'</p></div>';
+                html = '<div class="stream-status status-error"><h3>'+$.i18n._("Can not connect to the streaming server")+'</h3><p>'+status+'</p></div>';
             }
             $("#s"+id+"Liquidsoap-error-msg-element").html(html);
         }
@@ -250,7 +250,8 @@ function setupEventListeners() {
     // qtip for help text
     $(".override_help_icon").qtip({
         content: {
-            text: "If Airtime is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151. For more detail, please read the <a target=\"_blank\" href=\"http://www.sourcefabric.org/en/airtime/manuals/\">Airtime manual</a>."
+            text: $.i18n._("If Airtime is behind a router or firewall, you may need to configure port forwarding and this field information will be incorrect. In this case you will need to manually update this field so it shows the correct host/port/mount that your DJ's need to connect to. The allowed range is between 1024 and 49151.")+" "+
+                $.i18n._("For more details, please read the ")+"<a target=\"_blank\" href=\"http://www.sourcefabric.org/en/airtime/manuals/\">"+$.i18n._("Airtime manual")+"</a>."
         },
         hide: {
             delay: 500,
@@ -271,7 +272,7 @@ function setupEventListeners() {
     
     $(".icecast_metadata_help_icon").qtip({
         content: {
-            text: "Check this option to enable metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option."
+            text: $.i18n._("Check this option to enable metadata for OGG streams (stream metadata is the track title, artist, and show name that is displayed in an audio player). VLC and mplayer have a serious bug when playing an OGG/VORBIS stream that has metadata information enabled: they will disconnect from the stream after every song. If you are using an OGG stream and your listeners do not require support for these audio players, then feel free to enable this option.")
         },
         hide: {
             delay: 500,
@@ -292,7 +293,7 @@ function setupEventListeners() {
     
     $("#auto_transition_help").qtip({
         content: {
-            text: "Check this box to automatically switch off Master/Show source upon source disconnection."
+            text: $.i18n._("Check this box to automatically switch off Master/Show source upon source disconnection.")
         },
         hide: {
             delay: 500,
@@ -313,7 +314,7 @@ function setupEventListeners() {
     
     $("#auto_switch_help").qtip({
         content: {
-            text: "Check this box to automatically switch on Master/Show source upon source connection."
+            text: $.i18n._("Check this box to automatically switch on Master/Show source upon source connection.")
         },
         hide: {
             delay: 500,
@@ -334,7 +335,7 @@ function setupEventListeners() {
     
     $(".stream_username_help_icon").qtip({
         content: {
-            text: "If your Icecast server expects a username of 'source', this field can be left blank."
+            text: $.i18n._("If your Icecast server expects a username of 'source', this field can be left blank.")
         },
         hide: {
             delay: 500,
@@ -355,7 +356,7 @@ function setupEventListeners() {
     
     $(".master_username_help_icon").qtip({
         content: {
-            text: "If your live streaming client does not ask for a username, this field should be 'source'."
+            text: $.i18n._("If your live streaming client does not ask for a username, this field should be 'source'.")
         },
         hide: {
             delay: 500,
@@ -375,12 +376,7 @@ function setupEventListeners() {
     })
     
     $('#stream_save').live('click', function(){
-        var confirm_pypo_restart_text = "If you change the username or password values for an enabled stream the "
-            + "playout engine will be rebooted and your listeners will hear silence for"
-            + "5-10 seconds. Changing the following fields will NOT cause a reboot: "
-            + "Stream Label (Global Settings), and Switch Transition Fade(s), Master "
-            + "Username, and Master Password (Input Stream Settings). If Airtime is recording"
-            + ", and if the change causes a playout engine restart, the recording will be interrupted.";
+        var confirm_pypo_restart_text = $.i18n._("If you change the username or password values for an enabled stream the playout engine will be rebooted and your listeners will hear silence for 5-10 seconds. Changing the following fields will NOT cause a reboot: Stream Label (Global Settings), and Switch Transition Fade(s), Master Username, and Master Password (Input Stream Settings). If Airtime is recording, and if the change causes a playout engine restart, the recording will be interrupted.");
         if (confirm(confirm_pypo_restart_text)) {
             var data = $('#stream_form').serialize();
             var url = baseUrl+'/Preference/stream-setting';
diff --git a/airtime_mvc/public/js/airtime/preferences/support-setting.js b/airtime_mvc/public/js/airtime/preferences/support-setting.js
index 7e4331960..0e72daf9f 100644
--- a/airtime_mvc/public/js/airtime/preferences/support-setting.js
+++ b/airtime_mvc/public/js/airtime/preferences/support-setting.js
@@ -61,7 +61,7 @@ $(document).ready(function() {
     		var ul, li; 
     			
     		ul = logoEl.find('.errors');
-    		li = $("<li/>").append("Image must be one of jpg, jpeg, png, or gif");
+    		li = $("<li/>").append($.i18n._("Image must be one of jpg, jpeg, png, or gif"));
     		
     		//errors ul has already been created.
     		if (ul.length > 0) {
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index b7659504d..f3bcc07ca 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -53,7 +53,7 @@ function findHosts(request, callback) {
 	var noResult = new Array();
     noResult[0] = new Array();
     noResult[0]['value'] = $("#add_show_hosts_autocomplete").val();
-    noResult[0]['label'] = "No result found";
+    noResult[0]['label'] = $.i18n._("No result found");
     noResult[0]['index'] = null;
     
 	$.post(url,
@@ -226,7 +226,7 @@ function setAddShowEvents() {
     
     form.find(".airtime_auth_help_icon").qtip({
         content: {
-            text: "This follows the same security pattern for the shows: only users assigned to the show can connect."
+            text: $.i18n._("This follows the same security pattern for the shows: only users assigned to the show can connect.")
         },
         hide: {
             delay: 500,
@@ -246,7 +246,7 @@ function setAddShowEvents() {
     });
     form.find(".custom_auth_help_icon").qtip({
         content: {
-            text: "Specify custom authentication which will work only for this show."
+            text: $.i18n._("Specify custom authentication which will work only for this show.")
         },
         hide: {
             delay: 500,
@@ -266,7 +266,7 @@ function setAddShowEvents() {
     });
     form.find(".stream_username_help_icon").qtip({
         content: {
-            text: "If your live streaming client does not ask for a username, this field should be 'source'."
+            text: $.i18n._("If your live streaming client does not ask for a username, this field should be 'source'.")
         },
         hide: {
             delay: 500,
@@ -628,7 +628,7 @@ $(document).ready(function() {
 //Alert the error and reload the page
 //this function is used to resolve concurrency issue
 function alertShowErrorAndReload(){
-    alert("The show instance doesn't exist anymore!");
+    alert($.i18n._("The show instance doesn't exist anymore!"));
     window.location.reload();
 }
 
diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
index 006954154..4bfaabf56 100644
--- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
+++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
@@ -6,7 +6,7 @@
 
 function scheduleRefetchEvents(json) {
     if(json.show_error == true){
-        alert("The show instance doesn't exist anymore!");
+        alert($.i18n._("The show instance doesn't exist anymore!"));
     }
     if(json.show_id) {
         var dialog_id = parseInt($("#add_show_id").val(), 10);
@@ -41,7 +41,7 @@ function openAddShowForm() {
 function makeAddShowButton(){
     $('.fc-header-left')
         .append('<span class="fc-header-space"></span>')
-        .append('<span class="fc-button"><a href="#" class="add-button"><span class="add-icon"></span>Show</a></span>')
+        .append('<span class="fc-button"><a href="#" class="add-button"><span class="add-icon"></span>'+$.i18n._("Show")+'</a></span>')
         .find('span.fc-button:last > a')
             .click(function(){
                 openAddShowForm();
@@ -154,12 +154,12 @@ function viewDisplay( view ) {
         var calendarEl = this;
 
         var select = $('<select class="schedule_change_slots input_select"/>')
-            .append('<option value="1">1m</option>')
-            .append('<option value="5">5m</option>')
-            .append('<option value="10">10m</option>')
-            .append('<option value="15">15m</option>')
-            .append('<option value="30">30m</option>')
-            .append('<option value="60">60m</option>')
+            .append('<option value="1">'+$.i18n._("1m").'</option>')
+            .append('<option value="5">'+$.i18n._("5m").'</option>')
+            .append('<option value="10">'+$.i18n._("10m").'</option>')
+            .append('<option value="15">'+$.i18n._("15m").'</option>')
+            .append('<option value="30">'+$.i18n._("30m").'</option>')
+            .append('<option value="60">'+$.i18n._("60m").'</option>')
             .change(function(){
                 var slotMin = $(this).val();
                 var opt = view.calendar.options;
@@ -261,7 +261,7 @@ function eventRender(event, element, view) {
                 if (event.soundcloud_id === -1) {
                     $(element)
                         .find(".fc-event-time")
-                        .before('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
+                        .before('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
                 } else if (event.soundcloud_id > 0) {
                     
                 } else if (event.soundcloud_id === -2) {
@@ -275,7 +275,7 @@ function eventRender(event, element, view) {
                 if (event.soundcloud_id === -1) {
                     $(element)
                         .find(".fc-event-title")
-                        .after('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
+                        .after('<span id="'+event.id+'" title="'+$.i18n._("Show is empty")+'" class="small-icon show-empty"></span>');
                 } else if (event.soundcloud_id > 0) {
                     
                 } else if (event.soundcloud_id === -2) {
@@ -424,7 +424,7 @@ function addQtipToSCIcons(ele){
     if($(ele).hasClass("progress")){
         $(ele).qtip({
             content: {
-                text: "Uploading in progress..."
+                text: $.i18n.("Uploading in progress...")
             },
             position:{
                 adjust: {
@@ -442,13 +442,13 @@ function addQtipToSCIcons(ele){
     }else if($(ele).hasClass("soundcloud")){
         $(ele).qtip({
             content: {
-                text: "Retreiving data from the server...",
+                text: $.i18n.("Retreiving data from the server..."),
                 ajax: {
                     url: baseUrl+"/Library/get-upload-to-soundcloud-status",
                     type: "post",
                     data: ({format: "json", id : id, type: "file"}),
                     success: function(json, status){
-                        this.set('content.text', "The soundcloud id for this file is: "+json.sc_id);
+                        this.set('content.text', $.i18n.("The soundcloud id for this file is: ")+json.sc_id);
                     }
                 }
             },
@@ -468,14 +468,14 @@ function addQtipToSCIcons(ele){
     }else if($(ele).hasClass("sc-error")){
         $(ele).qtip({
             content: {
-                text: "Retreiving data from the server...",
+                text: $.i18n.("Retreiving data from the server..."),
                 ajax: {
                     url: baseUrl+"/Library/get-upload-to-soundcloud-status",
                     type: "post",
                     data: ({format: "json", id : id, type: "show"}),
                     success: function(json, status){
-                        this.set('content.text', "There was error while uploading to soundcloud.<br>"+"Error code: "+json.error_code+
-                                "<br>"+"Error msg: "+json.error_msg+"<br>");
+                        this.set('content.text', $.i18n.("There was error while uploading to soundcloud.")+"<br>"+$.i18n._("Error code: ")+json.error_code+
+                                "<br>"+$.i18n._("Error msg: ")+json.error_msg+"<br>");
                     }
                 }
             },
@@ -495,7 +495,7 @@ function addQtipToSCIcons(ele){
     }else if ($(ele).hasClass("show-empty")){
         $(ele).qtip({
             content: {
-                text: "This show has no scheduled content."
+                text: $.i18n._("This show has no scheduled content.")
             },
             position:{
                 adjust: {
@@ -548,7 +548,7 @@ function checkEmptyShowStatus(e) {
 //Alert the error and reload the page
 //this function is used to resolve concurrency issue
 function alertShowErrorAndReload(){
-  alert("The show instance doesn't exist anymore!");
+  alert($.i18n.("The show instance doesn't exist anymore!"));
   window.location.reload();
 }
 
diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js
index e91f65c34..8c92c528f 100644
--- a/airtime_mvc/public/js/airtime/schedule/schedule.js
+++ b/airtime_mvc/public/js/airtime/schedule/schedule.js
@@ -22,7 +22,7 @@ function checkShowLength(json) {
 
     if (percent > 100){
         $("#show_time_warning")
-            .text("Shows longer than their scheduled time will be cut off by a following show.")
+            .text($.i18n._("Shows longer than their scheduled time will be cut off by a following show."))
             .show();
     }
     else {
@@ -33,7 +33,7 @@ function checkShowLength(json) {
 }
 
 function confirmCancelShow(show_instance_id){
-    if (confirm('Cancel Current Show?')) {
+    if (confirm($.i18n._('Cancel Current Show?'))) {
         var url = baseUrl+"/Schedule/cancel-current-show";
         $.ajax({
             url: url,
@@ -46,7 +46,7 @@ function confirmCancelShow(show_instance_id){
 }
 
 function confirmCancelRecordedShow(show_instance_id){
-    if (confirm('Stop recording current show?')) {
+    if (confirm($.i18n._('Stop recording current show?'))) {
         var url = baseUrl+"/Schedule/cancel-current-show";
         $.ajax({
             url: url,
@@ -165,7 +165,7 @@ function buildScheduleDialog (json) {
         close: closeDialog,
         buttons: [
             {
-                text: "Ok",
+                text: $.i18n._("Ok"),
                 "class": "btn",
                 click: function() {
                     $(this).dialog("close");
@@ -207,14 +207,14 @@ function buildContentDialog (json){
      
     dialog.dialog({
         autoOpen: false,
-        title: "Contents of Show \"" + json.showTitle + "\"",
+        title: $.i18n._("Contents of Show") +" '" + json.showTitle + "'",
         width: width,
         height: height,
         modal: true,
         close: closeDialog,
         buttons: [
             {
-                text: "Ok",
+                text: $.i18n._("Ok"),
                 "class": "btn",
                 click: function() {
                     dialog.remove();
@@ -283,7 +283,7 @@ function createFullCalendar(data){
 //Alert the error and reload the page
 //this function is used to resolve concurrency issue
 function alertShowErrorAndReload(){
-    alert("The show instance doesn't exist anymore!");
+    alert($.i18n._("The show instance doesn't exist anymore!"));
     window.location.reload();
 }
 
@@ -324,7 +324,7 @@ $(document).ready(function() {
                 if (oItems.clear !== undefined) {
                     
                     callback = function() {
-                        if (confirm("Remove all content?")) {
+                        if (confirm($.i18n._("Remove all content?"))) {
                             $.post(oItems.clear.url, {format: "json", id: data.id}, function(json){
                                 scheduleRefetchEvents(json);
                             });
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 7fd4fa5b4..e410ba739 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -283,7 +283,7 @@ var AIRTIME = (function(AIRTIME){
     mod.fnRemove = function(aItems) {
         
         mod.disableUI();
-        if (confirm("Delete selected item(s)?")) {
+        if (confirm($.i18n._("Delete selected item(s)?"))) {
 	        $.post( baseUrl+"/showbuilder/schedule-remove",
 	            {"items": aItems, "format": "json"},
 	            mod.fnItemCallback
@@ -360,17 +360,17 @@ var AIRTIME = (function(AIRTIME){
             "aoColumns": [
             /* checkbox */ {"mDataProp": "allowed", "sTitle": "", "sWidth": "15px", "sClass": "sb-checkbox"},
             /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "16px"},
-            /* starts */ {"mDataProp": "starts", "sTitle": "Start", "sClass": "sb-starts", "sWidth": "60px"},
-            /* ends */ {"mDataProp": "ends", "sTitle": "End", "sClass": "sb-ends", "sWidth": "60px"},
-            /* runtime */ {"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length sb-length", "sWidth": "65px"},
-            /* title */ {"mDataProp": "title", "sTitle": "Title", "sClass": "sb-title"},
-            /* creator */ {"mDataProp": "creator", "sTitle": "Creator", "sClass": "sb-creator"},
-            /* album */ {"mDataProp": "album", "sTitle": "Album", "sClass": "sb-album"},
-            /* cue in */ {"mDataProp": "cuein", "sTitle": "Cue In", "bVisible": false, "sClass": "sb-cue-in"},
-            /* cue out */ {"mDataProp": "cueout", "sTitle": "Cue Out", "bVisible": false, "sClass": "sb-cue-out"},
-            /* fade in */ {"mDataProp": "fadein", "sTitle": "Fade In", "bVisible": false, "sClass": "sb-fade-in"},
-            /* fade out */ {"mDataProp": "fadeout", "sTitle": "Fade Out", "bVisible": false, "sClass": "sb-fade-out"},
-            /* Mime */  {"mDataProp" : "mime", "sTitle" : "Mime", "bVisible": false, "sClass": "sb-mime"}
+            /* starts */ {"mDataProp": "starts", "sTitle": $.i18n._("Start"), "sClass": "sb-starts", "sWidth": "60px"},
+            /* ends */ {"mDataProp": "ends", "sTitle": $.i18n._("End"), "sClass": "sb-ends", "sWidth": "60px"},
+            /* runtime */ {"mDataProp": "runtime", "sTitle": $.i18n._("Duration"), "sClass": "library_length sb-length", "sWidth": "65px"},
+            /* title */ {"mDataProp": "title", "sTitle": $.i18n._("Title"), "sClass": "sb-title"},
+            /* creator */ {"mDataProp": "creator", "sTitle": $.i18n._("Creator"), "sClass": "sb-creator"},
+            /* album */ {"mDataProp": "album", "sTitle": $.i18n._("Album"), "sClass": "sb-album"},
+            /* cue in */ {"mDataProp": "cuein", "sTitle": $.i18n._("Cue In"), "bVisible": false, "sClass": "sb-cue-in"},
+            /* cue out */ {"mDataProp": "cueout", "sTitle": $.i18n._("Cue Out"), "bVisible": false, "sClass": "sb-cue-out"},
+            /* fade in */ {"mDataProp": "fadein", "sTitle": $.i18n._("Fade In"), "bVisible": false, "sClass": "sb-fade-in"},
+            /* fade out */ {"mDataProp": "fadeout", "sTitle": $.i18n._("Fade Out"), "bVisible": false, "sClass": "sb-fade-out"},
+            /* Mime */  {"mDataProp" : "mime", "sTitle" : $.i18n._("Mime"), "bVisible": false, "sClass": "sb-mime"}
             ],
             
             "bJQueryUI": true,
@@ -527,7 +527,7 @@ var AIRTIME = (function(AIRTIME){
                     $node = $(nRow.children[0]);
                     $node.html('');
                     
-                    sSeparatorHTML = '<span>Show Empty</span>';
+                    sSeparatorHTML = '<span>'+$.i18n._("Show Empty")+'</span>';
                     cl = cl + " sb-empty odd";
                     
                     fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
@@ -539,7 +539,7 @@ var AIRTIME = (function(AIRTIME){
                     $node = $(nRow.children[0]);
                     $node.html('');
                     
-                    sSeparatorHTML = '<span>Recording From Line In</span>';
+                    sSeparatorHTML = '<span>'+$.i18n._("Recording From Line In")+'</span>';
                     cl = cl + " sb-record odd";
                     
                     fnPrepareSeparatorRow(sSeparatorHTML, cl, 1);
@@ -554,7 +554,7 @@ var AIRTIME = (function(AIRTIME){
                         if (!isAudioSupported(aData.mime)) {
                             $image.html('<span class="ui-icon ui-icon-locked"></span>');
                         } else {
-                            $image.html('<img title="Track preview" src="'+baseUrl+'/css/images/icon_audioclip.png"></img>')
+                            $image.html('<img title="'+$.i18n._("Track preview")+'" src="'+baseUrl+'/css/images/icon_audioclip.png"></img>')
                             .click(function() {
                                 open_show_preview(aData.instance, aData.pos);
                                 return false;
@@ -565,7 +565,7 @@ var AIRTIME = (function(AIRTIME){
                         $image.html('<span class="ui-icon ui-icon-alert"></span>');
                         $image.find(".ui-icon-alert").qtip({
                             content: {
-                                text: "Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't \"watched\" anymore."
+                                text: $.i18n._("Airtime is unsure about the status of this file. This can happen when the file is on a remote drive that is unaccessible or the file is in a directory that isn't \"watched\" anymore.")
                             },
                             style: {
                                 classes: "ui-tooltip-dark"
@@ -877,7 +877,7 @@ var AIRTIME = (function(AIRTIME){
                 //can't add items outside of shows.
                 if (prev.find("td:first").hasClass("dataTables_empty")
                         || prev.length === 0) {
-                    alert("Cannot schedule outside a show.");
+                    alert($.i18n._("Cannot schedule outside a show."));
                     ui.item.remove();
                     return;
                 }
@@ -932,10 +932,10 @@ var AIRTIME = (function(AIRTIME){
                     }
                     
                     if (selected.length === 1) {
-                        message = "Moving "+selected.length+" Item.";
+                        message = $.i18n._("Moving ")+selected.length+$.i18n._(" Item.");
                     }
                     else {
-                        message = "Moving "+selected.length+" Items.";
+                        message = $.i18n._("Moving ")+selected.length+$.i18n._(" Items.");
                     }
                     
                     draggingContainer = $('<tr/>')
@@ -983,28 +983,28 @@ var AIRTIME = (function(AIRTIME){
         $menu = $("<div class='btn-toolbar'/>");
         $menu.append("<div class='btn-group'>" +
                      "<button class='btn btn-small dropdown-toggle'  id='timeline-select' data-toggle='dropdown'>" +
-                         "Select <span class='caret'></span>" +
+                         $.i18n._("Select")+" <span class='caret'></span>" +
                      "</button>" +
                      "<ul class='dropdown-menu'>" +
-                         "<li id='timeline-sa'><a href='#'>Select all</a></li>" +
-                         "<li id='timeline-sn'><a href='#'>Select none</a></li>" +
+                         "<li id='timeline-sa'><a href='#'>"+$.i18n._("Select all")+"</a></li>" +
+                         "<li id='timeline-sn'><a href='#'>"+$.i18n._("Select none")+"</a></li>" +
                      "</ul>" +
                      "</div>")
             .append("<div class='btn-group'>" +
-                    "<button title='Remove overbooked tracks' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
+                    "<button title='"+$.i18n._("Remove overbooked tracks")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
                     "<i class='icon-white icon-cut'></i></button></div>")
             .append("<div class='btn-group'>" +
-                    "<button title='Remove selected scheduled items' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
+                    "<button title='"+$.i18n._("Remove selected scheduled items")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
                     "<i class='icon-white icon-trash'></i></button></div>");
 
         //if 'Add/Remove content' was chosen from the context menu
         //in the Calendar do not append these buttons
         if ($(".ui-dialog-content").length === 0) {
             $menu.append("<div class='btn-group'>" +
-                    "<button  title='Jump to the current playing track' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
+                    "<button  title='"+$.i18n._("Jump to the current playing track")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
                     "<i class='icon-white icon-step-forward'></i></button></div>")
             .append("<div class='btn-group'>" +
-                    "<button title='Cancel current show' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
+                    "<button title='"+$.i18n._("Cancel current show")+"' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
                     "<i class='icon-white icon-ban-circle'></i></button></div>");
         }
 
@@ -1019,7 +1019,7 @@ var AIRTIME = (function(AIRTIME){
             .click(function() {
                 var $tr,
                     data,
-                    msg = 'Cancel Current Show?';
+                    msg = $.i18n._('Cancel Current Show?');
                 
                 if (AIRTIME.button.isDisabled('icon-ban-circle', true) === true) {
                     return;
@@ -1031,7 +1031,7 @@ var AIRTIME = (function(AIRTIME){
                     data = $tr.data("aData");
                     
                     if (data.record === true) {
-                        msg = 'Stop recording current show?';
+                        msg = $.i18n._('Stop recording current show?');
                     }
                     
                     if (confirm(msg)) {
diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
index 74358a99d..70be61183 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js
@@ -15,7 +15,7 @@ AIRTIME = (function(AIRTIME) {
         timeStartId = "#sb_time_start",
         dateEndId = "#sb_date_end",
         timeEndId = "#sb_time_end",
-        $toggleLib = $("<a id='sb_edit' class='btn btn-small' href='#' title='Open library to add or remove content'>Add / Remove Content</a>"),
+        $toggleLib = $("<a id='sb_edit' class='btn btn-small' href='#' title='"+$.i18n._("Open library to add or remove content")+"'>"+$.i18n._("Add / Remove Content")+"</a>"),
         $libClose = $('<a />', {
             "class": "close-round",
             "href": "#",
diff --git a/airtime_mvc/public/js/airtime/status/status.js b/airtime_mvc/public/js/airtime/status/status.js
index 9223b247a..cd0699e3a 100644
--- a/airtime_mvc/public/js/airtime/status/status.js
+++ b/airtime_mvc/public/js/airtime/status/status.js
@@ -2,7 +2,7 @@ function generatePartitions(partitions){
 
     var rowTemplate = 
             '<tr class="partition-info">'+
-                '<td><span class="strong">Disk #%s</span>'+
+                '<td><span class="strong">'+$.i18n._("Disk")+' #%s</span>'+
                     '<ul id="watched-dir-list-%s">'+
                     '</ul>'+
                 '</td>'+
@@ -12,7 +12,7 @@ function generatePartitions(partitions){
                         '<div class="diskspace" style="width:%s%%;">'+
                         '</div>'+
                     '</div>'+
-                    '<div>%s%% in use</div>'+
+                    '<div>%s%% '+$.i18n._("in use")+'</div>'+
                 '</td>'+
             '</tr>';
 
diff --git a/airtime_mvc/public/js/airtime/user/user.js b/airtime_mvc/public/js/airtime/user/user.js
index 637666719..18d1d7d7a 100644
--- a/airtime_mvc/public/js/airtime/user/user.js
+++ b/airtime_mvc/public/js/airtime/user/user.js
@@ -45,16 +45,16 @@ function rowCallback( nRow, aData, iDisplayIndex ){
 
     if ( aData['type'] == "A" )
     {
-	    $('td:eq(3)', nRow).html( 'Admin' );
+	    $('td:eq(3)', nRow).html( $.i18n._('Admin') );
     } else if ( aData['type'] == "H" )
     {
-	    $('td:eq(3)', nRow).html( 'DJ' );
+	    $('td:eq(3)', nRow).html( $.i18n._('DJ') );
     } else if ( aData['type'] == "G" )
     {
-	    $('td:eq(3)', nRow).html( 'Guest' );
+	    $('td:eq(3)', nRow).html( $.i18n._('Guest') );
     } else if ( aData['type'] == "P" )
     {
-    	$('td:eq(3)', nRow).html( 'Program Manager' );
+    	$('td:eq(3)', nRow).html( $.i18n._('Program Manager') );
     }
     
     return nRow;