Merge branch '2.5.x' into cc-5709-airtime-analyzer

Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml

LICENSE

@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                       Version 3, 19 November 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@
 
                             Preamble
 
-  The GNU General Public License is a free, copyleft license for
+  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works.
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
+software for all its users.
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  To protect your rights, we need to prevent others from denying you
+  Developers that use our General Public Licenses protect your rights
-these rights or asking you to surrender the rights.  Therefore, you have
+with two steps: (1) assert copyright on the software, and (2) offer
-certain responsibilities if you distribute copies of the software, or if
+you this License which gives you legal permission to copy, distribute
-you modify it: responsibilities to respect the freedom of others.
+and/or modify the software.
 
-  For example, if you distribute copies of such a program, whether
+  A secondary benefit of defending all users' freedom is that
-gratis or for a fee, you must pass on to the recipients the same
+improvements made in alternate versions of the program, if they
-freedoms that you received.  You must make sure that they, too, receive
+receive widespread use, become available for other developers to
-or can get the source code.  And you must show them these terms so they
+incorporate.  Many developers of free software are heartened and
-know their rights.
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
 
-  Developers that use the GNU GPL protect your rights with two steps:
+  The GNU Affero General Public License is designed specifically to
-(1) assert copyright on the software, and (2) offer you this License
+ensure that, in such cases, the modified source code becomes available
-giving you legal permission to copy, distribute and/or modify it.
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
 
-  For the developers' and authors' protection, the GPL clearly explains
+  An older license, called the Affero General Public License and
-that there is no warranty for this free software.  For both users' and
+published by Affero, was designed to accomplish similar goals.  This is
-authors' sake, the GPL requires that modified versions be marked as
+a different license, not a version of the Affero GPL, but Affero has
-changed, so that their problems will not be attributed erroneously to
+released a new version of the Affero GPL which permits relicensing under
-authors of previous versions.
+this license.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
+but the work with which it is combined will remain governed by version
-section 13, concerning interaction through a network will apply to the
+3 of the GNU General Public License.
-combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
+the GNU Affero General Public License from time to time.  Such new versions
-be similar in spirit to the present version, but may differ in detail to
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -635,41 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
+    it under the terms of the GNU Affero General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If the program does terminal interaction, make it output a short
+  If your software can interact with users remotely through a computer
-notice like this when it starts in an interactive mode:
+network, you should also make sure that it provides a way for users to
-
+get its source.  For example, if your program is a web application, its
-    <program>  Copyright (C) <year>  <name of author>
+interface could display a "Source" link that leads users to an archive
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+of the code.  There are many ways you could offer source, and different
-    This is free software, and you are welcome to redistribute it
+solutions will be better for different programs; see section 13 for the
-    under certain conditions; type `show c' for details.
+specific requirements.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-

airtime_mvc/application/Bootstrap.php

@@ -193,7 +193,8 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     {
         $front = Zend_Controller_Front::getInstance();
         $router = $front->getRouter();
-
+        $front->setBaseUrl(Application_Common_OsPath::getBaseDir());
+        
         $router->addRoute(
             'password-change',
             new Zend_Controller_Router_Route('password-change/:user_id/:token', array(

airtime_mvc/application/common/OsPath.php

@@ -65,8 +65,10 @@ class Application_Common_OsPath{
     }
     
     public static function getBaseDir() {
-        $baseUrl = dirname($_SERVER['SCRIPT_NAME']);
+        
-
+        $CC_CONFIG = Config::getConfig();
+        $baseUrl = $CC_CONFIG['baseDir'];
+        
         if ($baseUrl[0] != "/") {
             $baseUrl = "/".$baseUrl;
         }
@@ -74,7 +76,8 @@ class Application_Common_OsPath{
         if ($baseUrl[strlen($baseUrl) -1] != "/") {
             $baseUrl = $baseUrl."/";
         }
-
+        
+        
         return $baseUrl;
     }
 }

airtime_mvc/application/controllers/LocaleController.php

@@ -12,12 +12,11 @@ class LocaleController extends Zend_Controller_Action
         $this->_helper->viewRenderer->setNoRender(true);
         header("Content-type: text/javascript");
 
-        $baseUrl = Application_Common_OsPath::getBaseDir();
         $locale = Application_Model_Preference::GetLocale();
         echo "var datatables_dict =" .
             file_get_contents(Application_Common_OsPath::join(
-                dirname(__file__),
+                $_SERVER["DOCUMENT_ROOT"],
-                "../../public/js/datatables/i18n/",
+                "js/datatables/i18n/",
                 $locale.".txt")
             );
     }

airtime_mvc/application/controllers/LoginController.php

@@ -56,6 +56,8 @@ class LoginController extends Zend_Controller_Action
                     
                     $result = $auth->authenticate($authAdapter);
                     if ($result->isValid()) {
+                        //  Regenerate session id on login to prevent session fixation.
+                        Zend_Session::regenerateId();
                         //all info about this user from the login table omit only the password
                         $userInfo = $authAdapter->getResultRowObject(null, 'password');
 

airtime_mvc/application/controllers/PluploadController.php

@@ -30,6 +30,33 @@ class PluploadController extends Zend_Controller_Action
         if (Application_Model_Systemstatus::isDiskOverQuota()) {
             $this->view->quotaLimitReached = true;
         }
+
+        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $csrf_namespace->setExpirationSeconds(5*60*60);
+        $csrf_namespace->authtoken = sha1(uniqid(rand(),1));
+
+        $csrf_element = new Zend_Form_Element_Hidden('csrf');
+        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
+        $csrf_form = new Zend_Form();
+        $csrf_form->addElement($csrf_element);
+        $this->view->form = $csrf_form;
+    }
+
+    public function uploadAction()
+    {
+        $current_namespace = new Zend_Session_Namespace('csrf_namespace');
+        $observed_csrf_token = $this->_getParam('csrf_token');
+        $expected_csrf_token = $current_namespace->authtoken;
+
+        if($observed_csrf_token == $expected_csrf_token){
+            $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
+            $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir);
+            $tempFileName = basename($tempFilePath);
+         
+            $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
+        }else{
+            $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "valid" => false, "error" => "CSRF token did not match."));
+        }
     }
 
     public function recentUploadsAction()

airtime_mvc/application/controllers/PreferenceController.php

@@ -201,6 +201,10 @@ class PreferenceController extends Zend_Controller_Action
         $num_of_stream = intval(Application_Model_Preference::GetNumOfStreams());
         $form = new Application_Form_StreamSetting();
 
+        $form->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $form->setSetting($setting);
         $form->startFrom();
 

airtime_mvc/application/forms/AddUser.php

@@ -21,6 +21,10 @@ class Application_Form_AddUser extends Zend_Form
         $hidden->setDecorators(array('ViewHelper'));
         $this->addElement($hidden);
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $login = new Zend_Form_Element_Text('login');
         $login->setLabel(_('Username:'));
         $login->setAttrib('class', 'input_text');

airtime_mvc/application/forms/EditUser.php

@@ -22,6 +22,10 @@ class Application_Form_EditUser extends Zend_Form
         $this->setDecorators(array(
                 array('ViewScript', array('viewScript' => 'form/edit-user.phtml', "currentUser" => $currentUser->getLogin()))));
         $this->setAttrib('id', 'current-user-form');
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
         
         $hidden = new Zend_Form_Element_Hidden('cu_user_id');
         $hidden->setDecorators(array('ViewHelper'));

airtime_mvc/application/forms/Login.php

@@ -10,6 +10,10 @@ class Application_Form_Login extends Zend_Form
         // Set the method for the display form to POST
         $this->setMethod('post');
 
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique'
+        ));
+
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/login.phtml'))
         ));

airtime_mvc/application/forms/Preferences.php

@@ -15,6 +15,14 @@ class Application_Form_Preferences extends Zend_Form
         ));
 
         $general_pref = new Application_Form_GeneralPreferences();
+
+        $this->addElement('hash', 'csrf', array(
+           'salt' => 'unique',
+           'decorators' => array(
+                'ViewHelper'
+            )
+        ));
+
         $this->addSubForm($general_pref, 'preferences_general');
 
             $email_pref = new Application_Form_EmailServerPreferences();

airtime_mvc/application/models/Locale.php

@@ -15,7 +15,7 @@ class Application_Model_Locale
             "hr_HR" => "Hrvatski",
             "hu_HU" => "Magyar",
             "it_IT" => "Italiano",
-            //"ja"    => "日本語",
+            "ja_JP"    => "日本語",
             "ko_KR" => "한국어",
             "pl_PL" => "Polski",
             "pt_BR" => "Português (Brasil)",

airtime_mvc/application/services/SchedulerService.php

@@ -183,6 +183,9 @@ class Application_Service_SchedulerService
                 ->limit(1)
                 ->findOne();
 
+            if (is_null($showInstanceWithMostRecentSchedule)) {
+                return null;
+            }
             $instanceId = $showInstanceWithMostRecentSchedule->getDbId();
         }
 

airtime_mvc/application/views/scripts/form/edit-user.phtml

@@ -157,6 +157,9 @@
                 </ul>
             <?php endif; ?> 
         </dd>
+
+        <?php echo $this->element->getElement('csrf') ?>
+
         <button type="submit" id="cu_save_user" class="btn btn-small right-floated"><?php echo _("Save")?></button>
     </dl>
 </form>

airtime_mvc/application/views/scripts/form/login.phtml

@@ -27,6 +27,8 @@
     <dd id="locale-element">
       <?php echo $this->element->getElement('locale') ?>
     </dd>
+
+    <?php echo $this->element->getElement('csrf') ?>
     
     <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
         <dt id="reset-label" class="hidden">&nbsp;</dt>

airtime_mvc/application/views/scripts/form/preferences.phtml

@@ -1,5 +1,5 @@
 <form method="<?php echo $this->element->getMethod() ?>" enctype="multipart/form-data">
-
+    <?php echo $this->element->getElement('csrf') ?>
     <?php echo $this->element->getSubform('preferences_general') ?>
     
     <h3 class="collapsible-header" id="email-server-heading"><span class="arrow-icon"></span><?php echo _("Email / Mail Server Settings"); ?></h3>

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -2,6 +2,7 @@
 #plupload_files input[type="file"] {
     font-size: 200px !important;
 }
+<<<<<<< HEAD
 </style>
 <?php if ($this->quotaLimitReached) { ?>
     <div class="errors quota-reached">
@@ -11,7 +12,8 @@
 }
 ?>
 <form id="plupload_form" <?php if ($this->quotaLimitReached) { ?> class="hidden" <?php } ?>>
-	<div id="plupload_files"></div>	
+    <?php echo $this->form->getElement('csrf') ?>
+    <div id="plupload_files"></div>	
 </form>
 <div id="plupload_error">
 	<table></table>

airtime_mvc/application/views/scripts/preference/stream-setting.phtml

@@ -4,6 +4,7 @@
     <?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"><?php echo _("Save") ?></button>
+    <?php echo $this->form->getElement('csrf') ?>
     <div style="clear:both"></div>
     <?php }?>
   <?php echo $this->statusMsg;?>

airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po

@@ -13,7 +13,8 @@ msgstr ""
 "POT-Creation-Date: 2014-04-23 15:57-0400\n"
 "PO-Revision-Date: 2014-01-29 15:09+0000\n"
 "Last-Translator: andrey.podshivalov\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
+"airtime/language/en_GB/)\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -221,6 +222,7 @@ msgid "Can't move a past show"
 msgstr "Can't move a past show"
 
 #: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Can't move show into past"
 
@@ -230,18 +232,27 @@ msgstr "Can't move show into past"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:294
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Cannot schedule overlapping shows"
 
 #: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "Can't move a recorded show less than 1 hour before its rebroadcasts."
 
 #: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Show was deleted because recorded show does not exist!"
 
 #: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Must wait 1 hour to rebroadcast."
 
@@ -252,6 +263,9 @@ msgstr "Must wait 1 hour to rebroadcast."
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:71
 #: airtime_mvc/application/controllers/LocaleController.php:66
 #: airtime_mvc/application/models/Block.php:1363
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Title"
 
@@ -262,6 +276,9 @@ msgstr "Title"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:57
 #: airtime_mvc/application/controllers/LocaleController.php:67
 #: airtime_mvc/application/models/Block.php:1349
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creator"
 
@@ -270,6 +287,7 @@ msgstr "Creator"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:49
 #: airtime_mvc/application/controllers/LocaleController.php:68
 #: airtime_mvc/application/models/Block.php:1341
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -279,6 +297,8 @@ msgstr "Album"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:65
 #: airtime_mvc/application/controllers/LocaleController.php:81
 #: airtime_mvc/application/models/Block.php:1357
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Length"
 
@@ -288,6 +308,7 @@ msgstr "Length"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:59
 #: airtime_mvc/application/controllers/LocaleController.php:75
 #: airtime_mvc/application/models/Block.php:1351
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genre"
 
@@ -295,6 +316,7 @@ msgstr "Genre"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:67
 #: airtime_mvc/application/controllers/LocaleController.php:83
 #: airtime_mvc/application/models/Block.php:1359
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Mood"
 
@@ -302,6 +324,7 @@ msgstr "Mood"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:61
 #: airtime_mvc/application/controllers/LocaleController.php:77
 #: airtime_mvc/application/models/Block.php:1353
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Label"
 
@@ -310,6 +333,8 @@ msgstr "Label"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:52
 #: airtime_mvc/application/controllers/LocaleController.php:71
 #: airtime_mvc/application/models/Block.php:1344
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Composer"
 
@@ -317,6 +342,7 @@ msgstr "Composer"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:60
 #: airtime_mvc/application/controllers/LocaleController.php:76
 #: airtime_mvc/application/models/Block.php:1352
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -325,6 +351,8 @@ msgstr "ISRC"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:54
 #: airtime_mvc/application/controllers/LocaleController.php:73
 #: airtime_mvc/application/models/Block.php:1346
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -332,10 +360,12 @@ msgstr "Copyright"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:75
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/models/Block.php:1367
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Year"
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Track"
 
@@ -343,6 +373,7 @@ msgstr "Track"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:53
 #: airtime_mvc/application/controllers/LocaleController.php:72
 #: airtime_mvc/application/models/Block.php:1345
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Conductor"
 
@@ -350,20 +381,24 @@ msgstr "Conductor"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:62
 #: airtime_mvc/application/controllers/LocaleController.php:78
 #: airtime_mvc/application/models/Block.php:1354
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Language"
 
 #: airtime_mvc/application/services/HistoryService.php:1146
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Start Time"
 
 #: airtime_mvc/application/services/HistoryService.php:1147
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "End Time"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Played"
 
@@ -533,37 +568,63 @@ msgstr "No open smart block"
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
 #, php-format
-msgid "%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"
+msgid ""
-msgstr "%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
 #, php-format
-msgid "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgid ""
-msgstr "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
 msgid "Welcome to Airtime!"
 msgstr "Welcome to Airtime!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
-msgid "Here's how you can get started using Airtime to automate your broadcasts: "
+msgid ""
-msgstr "Here's how you can get started using Airtime to automate your broadcasts: "
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:7
-msgid "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."
+msgid ""
-msgstr "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."
+"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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:8
-msgid "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."
+msgid ""
-msgstr "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."
+"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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:9
-msgid "Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting 'Add / Remove Content'"
+msgid ""
-msgstr "Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting 'Add / Remove Content'"
+"Add media to the show by going to your show in the Schedule calendar, left-"
+"clicking on it and selecting 'Add / Remove Content'"
+msgstr ""
+"Add media to the show by going to your show in the Schedule calendar, left-"
+"clicking on it and selecting 'Add / Remove Content'"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:10
-msgid "Select your media from the left pane and drag them to your show in the right pane."
+msgid ""
-msgstr "Select your media from the left pane and drag them to your show in the right pane."
+"Select your media from the left pane and drag them to your show in the right "
+"pane."
+msgstr ""
+"Select your media from the left pane and drag them to your show in the right "
+"pane."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:12
 msgid "Then you're good to go!"
@@ -576,6 +637,7 @@ msgstr "For more detailed help, read the %suser manual%s."
 
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -815,8 +877,12 @@ msgid "Add"
 msgstr "Add"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
-msgid "Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)"
+msgid ""
-msgstr "Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)"
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -841,8 +907,16 @@ msgstr "(Required)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
 #, php-format
-msgid "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.%sClick the 'Send support feedback' box and we'll make sure the features you use are constantly improving."
+msgid ""
-msgstr "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.%sClick the 'Send support feedback' box and we'll make sure the features you use are constantly improving."
+"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.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"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.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
 #, php-format
@@ -850,8 +924,10 @@ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
 msgstr "Click the box below to promote your station on %sSourcefabric.org%s."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
-msgid "(In order to promote your station, 'Send support feedback' must be enabled)."
+msgid ""
-msgstr "(In order to promote your station, 'Send support feedback' must be enabled)."
+"(In order to promote your station, 'Send support feedback' must be enabled)."
+msgstr ""
+"(In order to promote your station, 'Send support feedback' must be enabled)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
@@ -908,8 +984,10 @@ msgid "Additional Options"
 msgstr "Additional Options"
 
 #: airtime_mvc/application/views/scripts/form/stream-setting-form.phtml:137
-msgid "The following info will be displayed to listeners in their media player:"
+msgid ""
-msgstr "The following info will be displayed to listeners in their media player:"
+"The following info will be displayed to listeners in their media player:"
+msgstr ""
+"The following info will be displayed to listeners in their media player:"
 
 #: airtime_mvc/application/views/scripts/form/stream-setting-form.phtml:170
 msgid "(Your radio station website)"
@@ -934,13 +1012,27 @@ msgstr "Register Airtime"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
 #, php-format
-msgid "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.%sClick 'Yes, help Airtime' and we'll make sure the features you use are constantly improving."
+msgid ""
-msgstr "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.%sClick 'Yes, help Airtime' and we'll make sure the features you use are constantly improving."
+"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.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"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.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
 #, php-format
-msgid "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."
+msgid ""
-msgstr "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."
+"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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
@@ -1153,12 +1245,20 @@ msgid "Login"
 msgstr "Login"
 
 #: airtime_mvc/application/views/scripts/login/index.phtml:7
-msgid "Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'."
+msgid ""
-msgstr "Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'."
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
 
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:7
-msgid "Please enter your account e-mail address. You will receive a link to create a new password via e-mail."
+msgid ""
-msgstr "Please enter your account e-mail address. You will receive a link to create a new password via e-mail."
+"Please enter your account e-mail address. You will receive a link to create "
+"a new password via e-mail."
+msgstr ""
+"Please enter your account e-mail address. You will receive a link to create "
+"a new password via e-mail."
 
 #: airtime_mvc/application/views/scripts/login/password-restore-after.phtml:3
 msgid "Email sent"
@@ -1214,8 +1314,12 @@ msgstr "Update Required"
 
 #: airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml:80
 #, php-format
-msgid "To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."
+msgid ""
-msgstr "To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."
+"To play the media you will need to either update your browser to a recent "
+"version or update your %sFlash plugin%s."
+msgstr ""
+"To play the media you will need to either update your browser to a recent "
+"version or update your %sFlash plugin%s."
 
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:4
 msgid "Service"
@@ -1493,8 +1597,10 @@ msgid "Value is required and can't be empty"
 msgstr "Value is required and can't be empty"
 
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:19
-msgid "'%value%' is no valid email address in the basic format local-part@hostname"
+msgid ""
-msgstr "'%value%' is no valid email address in the basic format local-part@hostname"
+"'%value%' is no valid email address in the basic format local-part@hostname"
+msgstr ""
+"'%value%' is no valid email address in the basic format local-part@hostname"
 
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:33
 msgid "'%value%' does not fit the date format '%format%'"
@@ -1780,8 +1886,12 @@ msgstr "Default Fade Out (s):"
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:89
 #, php-format
-msgid "Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make front-end widgets work.)"
+msgid ""
-msgstr "Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make front-end widgets work.)"
+"Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make "
+"front-end widgets work.)"
+msgstr ""
+"Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make "
+"front-end widgets work.)"
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:90
 msgid "Disabled"
@@ -2354,8 +2464,12 @@ msgstr "'Length' should be in '00:00:00' format"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:541
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:554
-msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)"
+msgid ""
-msgstr "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)"
+"The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 "
+"00:00:00)"
+msgstr ""
+"The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 "
+"00:00:00)"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:568
 msgid "The value has to be numeric"
@@ -2434,8 +2548,12 @@ msgstr "Port %s is not available"
 
 #: airtime_mvc/application/layouts/scripts/login.phtml:16
 #, php-format
-msgid "Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgid ""
-msgstr "Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+"Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:27
 msgid "Logout"
@@ -2487,8 +2605,12 @@ msgid "Wrong username or password provided. Please try again."
 msgstr "Wrong username or password provided. Please try again."
 
 #: airtime_mvc/application/controllers/LoginController.php:142
-msgid "Email could not be sent. Check your mail server settings and ensure it has been configured properly."
+msgid ""
-msgstr "Email could not be sent. Check your mail server settings and ensure it has been configured properly."
+"Email could not be sent. Check your mail server settings and ensure it has "
+"been configured properly."
+msgstr ""
+"Email could not be sent. Check your mail server settings and ensure it has "
+"been configured properly."
 
 #: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
@@ -2684,8 +2806,12 @@ msgstr "Input must be in the format: hh:mm:ss.t"
 
 #: airtime_mvc/application/controllers/LocaleController.php:111
 #, php-format
-msgid "You are currently uploading files. %sGoing to another screen will cancel the upload process. %sAre you sure you want to leave the page?"
+msgid ""
-msgstr "You are currently uploading files. %sGoing to another screen will cancel the upload process. %sAre you sure you want to leave the page?"
+"You are currently uploading files. %sGoing to another screen will cancel the "
+"upload process. %sAre you sure you want to leave the page?"
+msgstr ""
+"You are currently uploading files. %sGoing to another screen will cancel the "
+"upload process. %sAre you sure you want to leave the page?"
 
 #: airtime_mvc/application/controllers/LocaleController.php:113
 msgid "Open Media Builder"
@@ -2720,8 +2846,14 @@ msgid "Playlist shuffled"
 msgstr "Playlist shuffled"
 
 #: airtime_mvc/application/controllers/LocaleController.php:122
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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_mvc/application/controllers/LocaleController.php:124
 #, php-format
@@ -2746,16 +2878,34 @@ msgid "Image must be one of jpg, jpeg, png, or gif"
 msgstr "Image must be one of jpg, jpeg, png, or gif"
 
 #: airtime_mvc/application/controllers/LocaleController.php:132
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/controllers/LocaleController.php:134
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/controllers/LocaleController.php:136
-msgid "The desired block length will not be reached if Airtime cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."
+msgid ""
-msgstr "The desired block length will not be reached if Airtime cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."
+"The desired block length will not be reached if Airtime cannot find enough "
+"unique tracks to match your criteria. Enable this option if you wish to "
+"allow tracks to be added multiple times to the smart block."
+msgstr ""
+"The desired block length will not be reached if Airtime cannot find enough "
+"unique tracks to match your criteria. Enable this option if you wish to "
+"allow tracks to be added multiple times to the smart block."
 
 #: airtime_mvc/application/controllers/LocaleController.php:137
 msgid "Smart block shuffled"
@@ -2799,8 +2949,12 @@ msgstr "This path is currently not accessible."
 
 #: airtime_mvc/application/controllers/LocaleController.php:160
 #, php-format
-msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."
+msgid ""
-msgstr "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."
+"Some stream types require extra configuration. Details about enabling %sAAC+ "
+"Support%s or %sOpus Support%s are provided."
+msgstr ""
+"Some stream types require extra configuration. Details about enabling %sAAC+ "
+"Support%s or %sOpus Support%s are provided."
 
 #: airtime_mvc/application/controllers/LocaleController.php:161
 msgid "Connected to the streaming server"
@@ -2815,8 +2969,18 @@ msgid "Can not connect to the streaming server"
 msgstr "Can not connect to the streaming server"
 
 #: airtime_mvc/application/controllers/LocaleController.php:166
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/controllers/LocaleController.php:167
 #, php-format
@@ -2824,45 +2988,95 @@ msgid "For more details, please read the %sAirtime Manual%s"
 msgstr "For more details, please read the %sAirtime Manual%s"
 
 #: airtime_mvc/application/controllers/LocaleController.php:169
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/controllers/LocaleController.php:170
-msgid "Check this box to automatically switch off Master/Show source upon source disconnection."
+msgid ""
-msgstr "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."
+msgstr ""
+"Check this box to automatically switch off Master/Show source upon source "
+"disconnection."
 
 #: airtime_mvc/application/controllers/LocaleController.php:171
-msgid "Check this box to automatically switch on Master/Show source upon source connection."
+msgid ""
-msgstr "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."
+msgstr ""
+"Check this box to automatically switch on Master/Show source upon source "
+"connection."
 
 #: airtime_mvc/application/controllers/LocaleController.php:172
-msgid "If your Icecast server expects a username of 'source', this field can be left blank."
+msgid ""
-msgstr "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."
+msgstr ""
+"If your Icecast server expects a username of 'source', this field can be "
+"left blank."
 
 #: airtime_mvc/application/controllers/LocaleController.php:173
 #: airtime_mvc/application/controllers/LocaleController.php:184
-msgid "If your live streaming client does not ask for a username, this field should be 'source'."
+msgid ""
-msgstr "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'."
+msgstr ""
+"If your live streaming client does not ask for a username, this field should "
+"be 'source'."
 
 #: airtime_mvc/application/controllers/LocaleController.php:175
-msgid "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."
+msgid ""
-msgstr "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."
+msgstr ""
+"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."
 
 #: airtime_mvc/application/controllers/LocaleController.php:176
-msgid "This is the admin username and password for Icecast/SHOUTcast to get listener statistics."
+msgid ""
-msgstr "This is the admin username and password for Icecast/SHOUTcast to get listener statistics."
+"This is the admin username and password for Icecast/SHOUTcast to get "
+"listener statistics."
+msgstr ""
+"This is the admin username and password for Icecast/SHOUTcast to get "
+"listener statistics."
 
 #: airtime_mvc/application/controllers/LocaleController.php:180
-msgid "Warning: You cannot change this field while the show is currently playing"
+msgid ""
-msgstr "Warning: You cannot change this field while the show is currently playing"
+"Warning: You cannot change this field while the show is currently playing"
+msgstr ""
+"Warning: You cannot change this field while the show is currently playing"
 
 #: airtime_mvc/application/controllers/LocaleController.php:181
 msgid "No result found"
 msgstr "No result found"
 
 #: airtime_mvc/application/controllers/LocaleController.php:182
-msgid "This follows the same security pattern for the shows: only users assigned to the show can connect."
+msgid ""
-msgstr "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."
+msgstr ""
+"This follows the same security pattern for the shows: only users assigned to "
+"the show can connect."
 
 #: airtime_mvc/application/controllers/LocaleController.php:183
 msgid "Specify custom authentication which will work only for this show."
@@ -2877,12 +3091,22 @@ msgid "Warning: Shows cannot be re-linked"
 msgstr "Warning: Shows cannot be re-linked"
 
 #: airtime_mvc/application/controllers/LocaleController.php:187
-msgid "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows"
+msgid ""
-msgstr "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows"
+"By linking your repeating shows any media items scheduled in any repeat show "
+"will also get scheduled in the other repeat shows"
+msgstr ""
+"By linking your repeating shows any media items scheduled in any repeat show "
+"will also get scheduled in the other repeat shows"
 
 #: airtime_mvc/application/controllers/LocaleController.php:188
-msgid "Timezone is set to the station timezone by default. Shows in the calendar will be displayed in your local time defined by the Interface Timezone in your user settings."
+msgid ""
-msgstr "Timezone is set to the station timezone by default. Shows in the calendar will be displayed in your local time defined by the Interface Timezone in your user settings."
+"Timezone is set to the station timezone by default. Shows in the calendar "
+"will be displayed in your local time defined by the Interface Timezone in "
+"your user settings."
+msgstr ""
+"Timezone is set to the station timezone by default. Shows in the calendar "
+"will be displayed in your local time defined by the Interface Timezone in "
+"your user settings."
 
 #: airtime_mvc/application/controllers/LocaleController.php:192
 msgid "Show"
@@ -3038,8 +3262,10 @@ msgid "month"
 msgstr "month"
 
 #: airtime_mvc/application/controllers/LocaleController.php:254
-msgid "Shows longer than their scheduled time will be cut off by a following show."
+msgid ""
-msgstr "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."
+msgstr ""
+"Shows longer than their scheduled time will be cut off by a following show."
 
 #: airtime_mvc/application/controllers/LocaleController.php:255
 msgid "Cancel Current Show?"
@@ -3108,8 +3334,10 @@ msgid "Cue Editor"
 msgstr "Cue Editor"
 
 #: airtime_mvc/application/controllers/LocaleController.php:289
-msgid "Waveform features are available in a browser supporting the Web Audio API"
+msgid ""
-msgstr "Waveform features are available in a browser supporting the Web Audio API"
+"Waveform features are available in a browser supporting the Web Audio API"
+msgstr ""
+"Waveform features are available in a browser supporting the Web Audio API"
 
 #: airtime_mvc/application/controllers/LocaleController.php:292
 msgid "Select all"
@@ -3406,8 +3634,12 @@ msgstr "Copied %s row%s to the clipboard"
 
 #: airtime_mvc/application/controllers/LocaleController.php:394
 #, php-format
-msgid "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."
+msgid ""
-msgstr "%sPrint view%sPlease use your browser's print function to print this table. Press the Escape key when finished."
+"%sPrint view%sPlease use your browser's print function to print this table. "
+"Press escape when finished."
+msgstr ""
+"%sPrint view%sPlease use your browser's print function to print this table. "
+"Press the Escape key when finished."
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:194
 #: airtime_mvc/application/controllers/LibraryController.php:189
@@ -3550,8 +3782,11 @@ msgid "Rebroadcast of show %s from %s at %s"
 msgstr "Rebroadcast of show %s from %s at %s"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
-msgid "Please make sure admin user/password is correct on System->Streams page."
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
-msgstr "Please make sure admin user/password is correct on System->Streams page."
+msgid ""
+"Please make sure admin user/password is correct on System->Streams page."
+msgstr ""
+"Please make sure admin user/password is correct on System->Streams page."
 
 #: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
@@ -3559,26 +3794,33 @@ msgstr "You are not allowed to access this resource."
 
 #: airtime_mvc/application/controllers/ApiController.php:315
 #: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "You are not allowed to access this resource. "
 
 #: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
 msgid "File does not exist in Airtime."
 msgstr "File does not exist in Airtime."
 
 #: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
 msgid "File does not exist in Airtime"
 msgstr "File does not exist in Airtime"
 
 #: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
 msgid "File doesn't exist in Airtime."
 msgstr "File doesn't exist in Airtime."
 
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Bad request. no 'mode' parameter passed."
 
 #: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Bad request. 'mode' parameter is invalid"
 
@@ -3697,6 +3939,7 @@ msgid "Airtime Password Reset"
 msgstr "Airtime Password Reset"
 
 #: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Select Country"
 
@@ -3738,8 +3981,12 @@ msgid "The show %s has been previously updated!"
 msgstr "The show %s has been previously updated!"
 
 #: airtime_mvc/application/models/Scheduler.php:178
-msgid "Content in linked shows must be scheduled before or after any one is broadcasted"
+msgid ""
-msgstr "Content in linked shows must be scheduled before or after any one is broadcasted"
+"Content in linked shows must be scheduled before or after any one is "
+"broadcasted"
+msgstr ""
+"Content in linked shows must be scheduled before or after any one is "
+"broadcasted"
 
 #: airtime_mvc/application/models/Scheduler.php:200
 #: airtime_mvc/application/models/Scheduler.php:289
@@ -3763,21 +4010,28 @@ msgstr "%s is nested within existing watched directory: %s"
 
 #: airtime_mvc/application/models/MusicDir.php:189
 #: airtime_mvc/application/models/MusicDir.php:370
+#: airtime_mvc/application/models/MusicDir.php:368
 #, php-format
 msgid "%s is not a valid directory."
 msgstr "%s is not a valid directory."
 
 #: airtime_mvc/application/models/MusicDir.php:232
 #, php-format
-msgid "%s is already set as the current storage dir or in the watched folders list"
+msgid ""
-msgstr "%s is already set as the current storage dir or in the watched folders list"
+"%s is already set as the current storage dir or in the watched folders list"
+msgstr ""
+"%s is already set as the current storage dir or in the watched folders list"
 
 #: airtime_mvc/application/models/MusicDir.php:388
+#: airtime_mvc/application/models/MusicDir.php:386
 #, php-format
-msgid "%s is already set as the current storage dir or in the watched folders list."
+msgid ""
-msgstr "%s is already set as the current storage dir or in the watched folders list."
+"%s is already set as the current storage dir or in the watched folders list."
+msgstr ""
+"%s is already set as the current storage dir or in the watched folders list."
 
 #: airtime_mvc/application/models/MusicDir.php:431
+#: airtime_mvc/application/models/MusicDir.php:429
 #, php-format
 msgid "%s doesn't exist in the watched list."
 msgstr "%s doesn't exist in the watched list."
@@ -3799,20 +4053,39 @@ msgstr ""
 "Cannot schedule overlapping shows.\n"
 "Note: Resizing a repeating show affects all of its repeats."
 
-#~ msgid "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."
+#: airtime_mvc/application/models/StoredFile.php:1017
-#~ msgstr "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."
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"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."
 
-#~ msgid "can't resize a past show"
+#: airtime_mvc/application/models/ShowInstance.php:257
-#~ msgstr "can't resize a past show"
+msgid "can't resize a past show"
+msgstr "can't resize a past show"
 
-#~ msgid "Should not overlap shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
-#~ msgstr "Should not overlap shows"
+msgid "Should not overlap shows"
+msgstr "Should not overlap shows"
 
-#~ msgid "Failed to create 'organize' directory."
+#: airtime_mvc/application/models/StoredFile.php:1003
-#~ msgstr "Failed to create 'organise' directory."
+msgid "Failed to create 'organize' directory."
+msgstr "Failed to create 'organise' directory."
 
-#~ msgid "This file appears to be corrupted and will not be added to media library."
+#: airtime_mvc/application/models/StoredFile.php:1026
-#~ msgstr "This file appears to be corrupted and will not be added to media library."
+msgid ""
+"This file appears to be corrupted and will not be added to media library."
+msgstr ""
+"This file appears to be corrupted and will not be added to media library."
 
-#~ msgid "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."
+#: airtime_mvc/application/models/StoredFile.php:1065
-#~ msgstr "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."
+msgid ""
+"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."
+msgstr ""
+"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."

airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po

@@ -3096,6 +3096,8 @@ msgstr ""
 msgid ""
 "Warning: You cannot change this field while the show is currently playing"
 msgstr ""
+"Attention: Vous ne pouvez pas modifier ce champ alors que l'émission est en "
+"cours de lecture"
 
 #: airtime_mvc/application/controllers/LocaleController.php:181
 msgid "No result found"

airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po

@@ -11,7 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2014-04-23 15:57-0400\n"
 "PO-Revision-Date: 2014-01-29 15:11+0000\n"
 "Last-Translator: andrey.podshivalov\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"airtime/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -219,6 +220,7 @@ msgid "Can't move a past show"
 msgstr "Não é possível mover um programa anterior"
 
 #: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Não é possível mover um programa anterior"
 
@@ -228,18 +230,29 @@ msgstr "Não é possível mover um programa anterior"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:294
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Não é permitido agendar programas sobrepostos"
 
 #: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
-msgstr "Não é possível mover um programa gravado menos de 1 hora antes de suas retransmissões."
+msgstr ""
+"Não é possível mover um programa gravado menos de 1 hora antes de suas "
+"retransmissões."
 
 #: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "O programa foi excluído porque a gravação prévia não existe!"
 
 #: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "É necessário aguardar 1 hora antes de retransmitir."
 
@@ -250,6 +263,9 @@ msgstr "É necessário aguardar 1 hora antes de retransmitir."
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:71
 #: airtime_mvc/application/controllers/LocaleController.php:66
 #: airtime_mvc/application/models/Block.php:1363
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Título"
 
@@ -260,6 +276,9 @@ msgstr "Título"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:57
 #: airtime_mvc/application/controllers/LocaleController.php:67
 #: airtime_mvc/application/models/Block.php:1349
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Criador"
 
@@ -268,6 +287,7 @@ msgstr "Criador"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:49
 #: airtime_mvc/application/controllers/LocaleController.php:68
 #: airtime_mvc/application/models/Block.php:1341
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Álbum"
 
@@ -277,6 +297,8 @@ msgstr "Álbum"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:65
 #: airtime_mvc/application/controllers/LocaleController.php:81
 #: airtime_mvc/application/models/Block.php:1357
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Duração"
 
@@ -286,6 +308,7 @@ msgstr "Duração"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:59
 #: airtime_mvc/application/controllers/LocaleController.php:75
 #: airtime_mvc/application/models/Block.php:1351
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Gênero"
 
@@ -293,6 +316,7 @@ msgstr "Gênero"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:67
 #: airtime_mvc/application/controllers/LocaleController.php:83
 #: airtime_mvc/application/models/Block.php:1359
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Humor"
 
@@ -300,6 +324,7 @@ msgstr "Humor"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:61
 #: airtime_mvc/application/controllers/LocaleController.php:77
 #: airtime_mvc/application/models/Block.php:1353
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Legenda"
 
@@ -308,6 +333,8 @@ msgstr "Legenda"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:52
 #: airtime_mvc/application/controllers/LocaleController.php:71
 #: airtime_mvc/application/models/Block.php:1344
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Compositor"
 
@@ -315,6 +342,7 @@ msgstr "Compositor"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:60
 #: airtime_mvc/application/controllers/LocaleController.php:76
 #: airtime_mvc/application/models/Block.php:1352
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -323,6 +351,8 @@ msgstr "ISRC"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:54
 #: airtime_mvc/application/controllers/LocaleController.php:73
 #: airtime_mvc/application/models/Block.php:1346
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -330,10 +360,12 @@ msgstr "Copyright"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:75
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/models/Block.php:1367
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Ano"
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
@@ -341,6 +373,7 @@ msgstr ""
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:53
 #: airtime_mvc/application/controllers/LocaleController.php:72
 #: airtime_mvc/application/models/Block.php:1345
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Maestro"
 
@@ -348,20 +381,24 @@ msgstr "Maestro"
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:62
 #: airtime_mvc/application/controllers/LocaleController.php:78
 #: airtime_mvc/application/models/Block.php:1354
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Idioma"
 
 #: airtime_mvc/application/services/HistoryService.php:1146
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1147
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Executado"
 
@@ -531,37 +568,63 @@ msgstr "Nenhum bloco aberto"
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
 #, php-format
-msgid "%sAirtime%s %s, the open radio software for scheduling and remote station management. %s"
+msgid ""
-msgstr "%sAirtime%s %s, um software livre para automação e gestão remota de estação de rádio. % s"
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, um software livre para automação e gestão remota de estação "
+"de rádio. % s"
 
 #: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
 #, php-format
-msgid "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgid ""
-msgstr "%sSourcefabric%s o.p.s. Airtime é distribuído sob a licença %sGNU GPL v.3%s"
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime é distribuído sob a licença %sGNU GPL v.3%s"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
 msgid "Welcome to Airtime!"
 msgstr "Benvindo ao Airtime!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
-msgid "Here's how you can get started using Airtime to automate your broadcasts: "
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
 msgstr "Saiba como utilizar o Airtime para automatizar suas transmissões:"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:7
-msgid "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."
+msgid ""
-msgstr "Comece adicionando seus arquivos à biblioteca usando o botão \"Adicionar Mídia\" . Você também pode arrastar e soltar os arquivos dentro da página."
+"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."
+msgstr ""
+"Comece adicionando seus arquivos à biblioteca usando o botão \"Adicionar "
+"Mídia\" . Você também pode arrastar e soltar os arquivos dentro da página."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:8
-msgid "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."
+msgid ""
-msgstr "Crie um programa, através do 'Calendário' , clicando no ícone '+Programa'. Este pode ser um programa inédito ou retransmitido. Apenas administradores e gerentes de programação podem adicionar programas."
+"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."
+msgstr ""
+"Crie um programa, através do 'Calendário' , clicando no ícone '+Programa'. "
+"Este pode ser um programa inédito ou retransmitido. Apenas administradores e "
+"gerentes de programação podem adicionar programas."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:9
-msgid "Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting 'Add / Remove Content'"
+msgid ""
-msgstr "Adicione conteúdos ao seu programa, através do link Calendário, clique com o botão esquerdo do mouse sobre o programa e selecione \"Adicionar / Remover Conteúdo\""
+"Add media to the show by going to your show in the Schedule calendar, left-"
+"clicking on it and selecting 'Add / Remove Content'"
+msgstr ""
+"Adicione conteúdos ao seu programa, através do link Calendário, clique com o "
+"botão esquerdo do mouse sobre o programa e selecione \"Adicionar / Remover "
+"Conteúdo\""
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:10
-msgid "Select your media from the left pane and drag them to your show in the right pane."
+msgid ""
-msgstr "Selecione seu conteúdo a partir da lista , no painel esquerdo, e arraste-o para o seu programa, no painel da direita."
+"Select your media from the left pane and drag them to your show in the right "
+"pane."
+msgstr ""
+"Selecione seu conteúdo a partir da lista , no painel esquerdo, e arraste-o "
+"para o seu programa, no painel da direita."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:12
 msgid "Then you're good to go!"
@@ -574,6 +637,7 @@ msgstr "Para obter ajuda mais detalhada, leia o %smanual do usuário%s."
 
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Fluxo ao vivo"
 
@@ -813,8 +877,12 @@ msgid "Add"
 msgstr "Adicionar"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
-msgid "Rescan watched directory (This is useful if it is network mount and may be out of sync with Airtime)"
+msgid ""
-msgstr "Verificar novamente diretório monitorado (Isso pode ser útil em caso de montagem de volume em rede e este estiver fora de sincronia com o Airtime)"
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Verificar novamente diretório monitorado (Isso pode ser útil em caso de "
+"montagem de volume em rede e este estiver fora de sincronia com o Airtime)"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44
 msgid "Remove watched directory"
@@ -839,17 +907,30 @@ msgstr "(Obrigatório)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
 #, php-format
-msgid "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.%sClick the 'Send support feedback' box and we'll make sure the features you use are constantly improving."
+msgid ""
-msgstr "Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como você está usando o produto. Essas informações serão colhidas regularmente, a fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar Comentário de Apoio\" e nós garantiremos a evolução contínua das funcionalidade que você utiliza."
+"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.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como "
+"você está usando o produto. Essas informações serão colhidas regularmente, a "
+"fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar "
+"Comentário de Apoio\" e nós garantiremos a evolução contínua das "
+"funcionalidade que você utiliza."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
 #, php-format
 msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-msgstr "Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
+msgstr ""
+"Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
-msgid "(In order to promote your station, 'Send support feedback' must be enabled)."
+msgid ""
-msgstr "(para divulgação de sua estação, a opção 'Enviar Informações de Suporte\" precisa estar habilitada)"
+"(In order to promote your station, 'Send support feedback' must be enabled)."
+msgstr ""
+"(para divulgação de sua estação, a opção 'Enviar Informações de Suporte\" "
+"precisa estar habilitada)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
@@ -906,8 +987,10 @@ msgid "Additional Options"
 msgstr "Opções Adicionais"
 
 #: airtime_mvc/application/views/scripts/form/stream-setting-form.phtml:137
-msgid "The following info will be displayed to listeners in their media player:"
+msgid ""
-msgstr "A informação a seguir será exibida para os ouvintes em seu player de mídia:"
+"The following info will be displayed to listeners in their media player:"
+msgstr ""
+"A informação a seguir será exibida para os ouvintes em seu player de mídia:"
 
 #: airtime_mvc/application/views/scripts/form/stream-setting-form.phtml:170
 msgid "(Your radio station website)"
@@ -932,13 +1015,26 @@ msgstr "Registrar Airtime"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
 #, php-format
-msgid "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.%sClick 'Yes, help Airtime' and we'll make sure the features you use are constantly improving."
+msgid ""
-msgstr "Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como você está usando o produto. Essas informações serão colhidas regularmente, a fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar Comentário de Apoio\" e nós garantiremos a evolução contínua das funcionalidade que você utiliza."
+"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.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como "
+"você está usando o produto. Essas informações serão colhidas regularmente, a "
+"fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar "
+"Comentário de Apoio\" e nós garantiremos a evolução contínua das "
+"funcionalidade que você utiliza."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
 #, php-format
-msgid "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."
+msgid ""
-msgstr "Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
+"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."
+msgstr ""
+"Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
@@ -1151,12 +1247,20 @@ msgid "Login"
 msgstr "Acessar"
 
 #: airtime_mvc/application/views/scripts/login/index.phtml:7
-msgid "Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'."
+msgid ""
-msgstr "Bem-vindo à demonstração online do Airtime! Autentique-se com usuário 'admin' e senha \"admin\"."
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Bem-vindo à demonstração online do Airtime! Autentique-se com usuário "
+"'admin' e senha \"admin\"."
 
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:7
-msgid "Please enter your account e-mail address. You will receive a link to create a new password via e-mail."
+msgid ""
-msgstr "Digite seu endereço de email. Você receberá uma mensagem contendo um link para criar sua senha."
+"Please enter your account e-mail address. You will receive a link to create "
+"a new password via e-mail."
+msgstr ""
+"Digite seu endereço de email. Você receberá uma mensagem contendo um link "
+"para criar sua senha."
 
 #: airtime_mvc/application/views/scripts/login/password-restore-after.phtml:3
 msgid "Email sent"
@@ -1212,8 +1316,12 @@ msgstr "Atualização Necessária"
 
 #: airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml:80
 #, php-format
-msgid "To play the media you will need to either update your browser to a recent version or update your %sFlash plugin%s."
+msgid ""
-msgstr "Para reproduzir a mídia que você terá que quer atualizar seu navegador para uma versão recente ou atualizar seu %sFlash plugin%s."
+"To play the media you will need to either update your browser to a recent "
+"version or update your %sFlash plugin%s."
+msgstr ""
+"Para reproduzir a mídia que você terá que quer atualizar seu navegador para "
+"uma versão recente ou atualizar seu %sFlash plugin%s."
 
 #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:4
 msgid "Service"
@@ -1491,7 +1599,8 @@ msgid "Value is required and can't be empty"
 msgstr "Valor é obrigatório e não poder estar em branco."
 
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:19
-msgid "'%value%' is no valid email address in the basic format local-part@hostname"
+msgid ""
+"'%value%' is no valid email address in the basic format local-part@hostname"
 msgstr "%value%' não é um enderçeo de email válido"
 
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:33
@@ -1778,8 +1887,12 @@ msgstr ""
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:89
 #, php-format
-msgid "Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make front-end widgets work.)"
+msgid ""
-msgstr "Permitir que sites remotos acessem as informações sobre \"Programação\"?%s (Habilite para fazer com que widgets externos funcionem.)"
+"Allow Remote Websites To Access \"Schedule\" Info?%s (Enable this to make "
+"front-end widgets work.)"
+msgstr ""
+"Permitir que sites remotos acessem as informações sobre \"Programação\"?%s "
+"(Habilite para fazer com que widgets externos funcionem.)"
 
 #: airtime_mvc/application/forms/GeneralPreferences.php:90
 msgid "Disabled"
@@ -1892,7 +2005,9 @@ msgstr "Divulgue minha estação em Sourcefabric.org"
 #: airtime_mvc/application/forms/SupportSettings.php:148
 #, php-format
 msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-msgstr "Clicando nesta caixa, eu concordo com a %spolitica de privacidade%s da Sourcefabric."
+msgstr ""
+"Clicando nesta caixa, eu concordo com a %spolitica de privacidade%s da "
+"Sourcefabric."
 
 #: airtime_mvc/application/forms/RegisterAirtime.php:166
 #: airtime_mvc/application/forms/SupportSettings.php:171
@@ -2352,8 +2467,12 @@ msgstr "A duração deve ser informada no formato '00:00:00'"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:541
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:554
-msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)"
+msgid ""
-msgstr "O valor deve estar no formato timestamp (ex. 0000-00-00 ou 0000-00-00 00:00:00)"
+"The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 "
+"00:00:00)"
+msgstr ""
+"O valor deve estar no formato timestamp (ex. 0000-00-00 ou 0000-00-00 "
+"00:00:00)"
 
 #: airtime_mvc/application/forms/SmartBlockCriteria.php:568
 msgid "The value has to be numeric"
@@ -2432,8 +2551,12 @@ msgstr "Porta %s indisponível."
 
 #: airtime_mvc/application/layouts/scripts/login.phtml:16
 #, php-format
-msgid "Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgid ""
-msgstr "Airtime Copyright  ©Sourcefabric o.p.s. Todos od direitos reservados.%sMantido e distribuído sob licença GNU GPL v.3 by %sSourcefabric o.p.s%s"
+"Airtime Copyright ©Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright  ©Sourcefabric o.p.s. Todos od direitos reservados."
+"%sMantido e distribuído sob licença GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
 #: airtime_mvc/application/layouts/scripts/layout.phtml:27
 msgid "Logout"
@@ -2485,8 +2608,12 @@ msgid "Wrong username or password provided. Please try again."
 msgstr "Usuário ou senha inválidos. Tente novamente."
 
 #: airtime_mvc/application/controllers/LoginController.php:142
-msgid "Email could not be sent. Check your mail server settings and ensure it has been configured properly."
+msgid ""
-msgstr "O email não pôde ser enviado. Verifique as definições do servidor de email e certifique-se de que esteja corretamente configurado."
+"Email could not be sent. Check your mail server settings and ensure it has "
+"been configured properly."
+msgstr ""
+"O email não pôde ser enviado. Verifique as definições do servidor de email e "
+"certifique-se de que esteja corretamente configurado."
 
 #: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
@@ -2560,7 +2687,8 @@ msgstr "Você pode adicionar somente faixas a um bloco inteligente."
 #: airtime_mvc/application/controllers/LocaleController.php:50
 #: airtime_mvc/application/controllers/PlaylistController.php:163
 msgid "You can only add tracks, smart blocks, and webstreams to playlists."
-msgstr "Você pode adicionar apenas faixas, blocos e fluxos às listas de reprodução"
+msgstr ""
+"Você pode adicionar apenas faixas, blocos e fluxos às listas de reprodução"
 
 #: airtime_mvc/application/controllers/LocaleController.php:53
 msgid "Please select a cursor position on timeline."
@@ -2682,8 +2810,13 @@ msgstr "A entrada deve estar no formato hh:mm:ss.t"
 
 #: airtime_mvc/application/controllers/LocaleController.php:111
 #, php-format
-msgid "You are currently uploading files. %sGoing to another screen will cancel the upload process. %sAre you sure you want to leave the page?"
+msgid ""
-msgstr "Você está fazendo upload de arquivos neste momento. %s Ir a outra tela cancelará o processo de upload. %sTem certeza de que deseja sair desta página?"
+"You are currently uploading files. %sGoing to another screen will cancel the "
+"upload process. %sAre you sure you want to leave the page?"
+msgstr ""
+"Você está fazendo upload de arquivos neste momento. %s Ir a outra tela "
+"cancelará o processo de upload. %sTem certeza de que deseja sair desta "
+"página?"
 
 #: airtime_mvc/application/controllers/LocaleController.php:113
 msgid "Open Media Builder"
@@ -2718,8 +2851,14 @@ msgid "Playlist shuffled"
 msgstr "A lista foi embaralhada"
 
 #: airtime_mvc/application/controllers/LocaleController.php:122
-msgid "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."
+msgid ""
-msgstr "O Airtime não pôde determinar o status do arquivo. Isso pode acontecer quando o arquivo está armazenado em uma unidade remota atualmente inacessível ou está em um diretório que deixou de ser 'monitorado'."
+"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."
+msgstr ""
+"O Airtime não pôde determinar o status do arquivo. Isso pode acontecer "
+"quando o arquivo está armazenado em uma unidade remota atualmente "
+"inacessível ou está em um diretório que deixou de ser 'monitorado'."
 
 #: airtime_mvc/application/controllers/LocaleController.php:124
 #, php-format
@@ -2744,16 +2883,35 @@ msgid "Image must be one of jpg, jpeg, png, or gif"
 msgstr "A imagem precisa conter extensão jpg,  jpeg, png ou gif"
 
 #: airtime_mvc/application/controllers/LocaleController.php:132
-msgid "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."
+msgid ""
-msgstr "Um bloco estático salvará os critérios e gerará o conteúdo imediatamente. Isso permite que você edite e visualize-o na Biblioteca antes de adicioná-lo a um programa."
+"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."
+msgstr ""
+"Um bloco estático salvará os critérios e gerará o conteúdo imediatamente. "
+"Isso permite que você edite e visualize-o na Biblioteca antes de adicioná-lo "
+"a um programa."
 
 #: airtime_mvc/application/controllers/LocaleController.php:134
-msgid "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."
+msgid ""
-msgstr "Um bloco dinâmico apenas conterá critérios. O conteúdo do bloco será gerado após adicioná-lo a um programa. Você não será capaz de ver ou editar o conteúdo na Biblioteca."
+"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."
+msgstr ""
+"Um bloco dinâmico apenas conterá critérios. O conteúdo do bloco será gerado "
+"após adicioná-lo a um programa. Você não será capaz de ver ou editar o "
+"conteúdo na Biblioteca."
 
 #: airtime_mvc/application/controllers/LocaleController.php:136
-msgid "The desired block length will not be reached if Airtime cannot find enough unique tracks to match your criteria. Enable this option if you wish to allow tracks to be added multiple times to the smart block."
+msgid ""
-msgstr "A duração desejada do bloco não será completada se o Airtime não localizar faixas únicas suficientes que correspondem aos critérios informados. Ative esta opção se você deseja permitir que as mesmas faixas sejam adicionadas várias vezes num bloco inteligente."
+"The desired block length will not be reached if Airtime cannot find enough "
+"unique tracks to match your criteria. Enable this option if you wish to "
+"allow tracks to be added multiple times to the smart block."
+msgstr ""
+"A duração desejada do bloco não será completada se o Airtime não localizar "
+"faixas únicas suficientes que correspondem aos critérios informados. Ative "
+"esta opção se você deseja permitir que as mesmas faixas sejam adicionadas "
+"várias vezes num bloco inteligente."
 
 #: airtime_mvc/application/controllers/LocaleController.php:137
 msgid "Smart block shuffled"
@@ -2797,7 +2955,9 @@ msgstr "O caminho está inacessível no momento."
 
 #: airtime_mvc/application/controllers/LocaleController.php:160
 #, php-format
-msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."
+msgid ""
+"Some stream types require extra configuration. Details about enabling %sAAC+ "
+"Support%s or %sOpus Support%s are provided."
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:161
@@ -2813,8 +2973,18 @@ msgid "Can not connect to the streaming server"
 msgstr "Não é possível conectar ao servidor de streaming"
 
 #: airtime_mvc/application/controllers/LocaleController.php:166
-msgid "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."
+msgid ""
-msgstr "Se o Airtime estiver atrás de um roteador ou firewall, pode ser necessário configurar o redirecionamento de portas e esta informação de campo ficará incorreta. Neste caso, você terá de atualizar manualmente este campo para que ele exiba o corretamente o host / porta / ponto de montagem necessários para seu DJ para se conectar. O intervalo permitido é entre 1024 e 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."
+msgstr ""
+"Se o Airtime estiver atrás de um roteador ou firewall, pode ser necessário "
+"configurar o redirecionamento de portas e esta informação de campo ficará "
+"incorreta. Neste caso, você terá de atualizar manualmente este campo para "
+"que ele exiba o corretamente o host / porta / ponto de montagem necessários "
+"para seu DJ para se conectar. O intervalo permitido é entre 1024 e 49151."
 
 #: airtime_mvc/application/controllers/LocaleController.php:167
 #, php-format
@@ -2822,36 +2992,83 @@ msgid "For more details, please read the %sAirtime Manual%s"
 msgstr "Para mais informações, leia o %sManual do Airtime%s"
 
 #: airtime_mvc/application/controllers/LocaleController.php:169
-msgid "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."
+msgid ""
-msgstr "Marque esta opção para habilitar metadados para fluxos OGG (metadados fluxo são o título da faixa, artista e nome doprograma que é exibido em um player de áudio). VLC e MPlayer tem um bug sério quando executam fluxos Ogg / Vorbis, que possuem o recurso de metadados habilitado: eles vão desconectar do fluxo depois de cada faixa. Se você estiver transmitindo um fluxo no formato OGG e seus ouvintes não precisem de suporte para esses players de áudio, sinta-se à vontade para ativar essa opção."
+"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."
+msgstr ""
+"Marque esta opção para habilitar metadados para fluxos OGG (metadados fluxo "
+"são o título da faixa, artista e nome doprograma que é exibido em um player "
+"de áudio). VLC e MPlayer tem um bug sério quando executam fluxos Ogg / "
+"Vorbis, que possuem o recurso de metadados habilitado: eles vão desconectar "
+"do fluxo depois de cada faixa. Se você estiver transmitindo um fluxo no "
+"formato OGG e seus ouvintes não precisem de suporte para esses players de "
+"áudio, sinta-se à vontade para ativar essa opção."
 
 #: airtime_mvc/application/controllers/LocaleController.php:170
-msgid "Check this box to automatically switch off Master/Show source upon source disconnection."
+msgid ""
-msgstr "Marque esta caixa para desligar automaticamente as fontes Mestre / Programa, após a desconexão de uma fonte."
+"Check this box to automatically switch off Master/Show source upon source "
+"disconnection."
+msgstr ""
+"Marque esta caixa para desligar automaticamente as fontes Mestre / Programa, "
+"após a desconexão de uma fonte."
 
 #: airtime_mvc/application/controllers/LocaleController.php:171
-msgid "Check this box to automatically switch on Master/Show source upon source connection."
+msgid ""
-msgstr "Marque esta caixa para ligar automaticamente as fontes Mestre / Programa, após a conexão de uma fonte."
+"Check this box to automatically switch on Master/Show source upon source "
+"connection."
+msgstr ""
+"Marque esta caixa para ligar automaticamente as fontes Mestre / Programa, "
+"após a conexão de uma fonte."
 
 #: airtime_mvc/application/controllers/LocaleController.php:172
-msgid "If your Icecast server expects a username of 'source', this field can be left blank."
+msgid ""
-msgstr "Se o servidor Icecast esperar por um usuário 'source', este campo poderá permanecer em branco."
+"If your Icecast server expects a username of 'source', this field can be "
+"left blank."
+msgstr ""
+"Se o servidor Icecast esperar por um usuário 'source', este campo poderá "
+"permanecer em branco."
 
 #: airtime_mvc/application/controllers/LocaleController.php:173
 #: airtime_mvc/application/controllers/LocaleController.php:184
-msgid "If your live streaming client does not ask for a username, this field should be 'source'."
+msgid ""
-msgstr "Se o cliente de fluxo ao vivo não solicitar um usuário, este campo deve ser \"source\"."
+"If your live streaming client does not ask for a username, this field should "
+"be 'source'."
+msgstr ""
+"Se o cliente de fluxo ao vivo não solicitar um usuário, este campo deve ser "
+"\"source\"."
 
 #: airtime_mvc/application/controllers/LocaleController.php:175
-msgid "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."
+msgid ""
-msgstr "Se você alterar os campos de usuário ou senha de um fluxo ativo, o mecanismo de saída será reiniciado e seus ouvintes ouvirão um silêncio por 5-10 segundos. Alterando os seguintes campos não causará reinicialização: Legenda do Fluxo (Configurações Globais), e Mudar Fade(s) de Transição, Usuário Master e Senha Master (Configurações de fluxo de entrada). Se o Airtime estiver gravando  e, se a mudança fizer com que uma reinicialização de mecanismo de saída seja necessária, a gravação será interrompida."
+"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."
+msgstr ""
+"Se você alterar os campos de usuário ou senha de um fluxo ativo, o mecanismo "
+"de saída será reiniciado e seus ouvintes ouvirão um silêncio por 5-10 "
+"segundos. Alterando os seguintes campos não causará reinicialização: Legenda "
+"do Fluxo (Configurações Globais), e Mudar Fade(s) de Transição, Usuário "
+"Master e Senha Master (Configurações de fluxo de entrada). Se o Airtime "
+"estiver gravando  e, se a mudança fizer com que uma reinicialização de "
+"mecanismo de saída seja necessária, a gravação será interrompida."
 
 #: airtime_mvc/application/controllers/LocaleController.php:176
-msgid "This is the admin username and password for Icecast/SHOUTcast to get listener statistics."
+msgid ""
-msgstr "Este é o usuário e senha de servidores Icecast / SHOUTcast, para obter estatísticas de ouvintes."
+"This is the admin username and password for Icecast/SHOUTcast to get "
+"listener statistics."
+msgstr ""
+"Este é o usuário e senha de servidores Icecast / SHOUTcast, para obter "
+"estatísticas de ouvintes."
 
 #: airtime_mvc/application/controllers/LocaleController.php:180
-msgid "Warning: You cannot change this field while the show is currently playing"
+msgid ""
+"Warning: You cannot change this field while the show is currently playing"
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:181
@@ -2859,12 +3076,17 @@ msgid "No result found"
 msgstr "Nenhum resultado encontrado"
 
 #: airtime_mvc/application/controllers/LocaleController.php:182
-msgid "This follows the same security pattern for the shows: only users assigned to the show can connect."
+msgid ""
-msgstr "Este segue o mesmo padrão de segurança para os programas: apenas usuários designados para o programa poderão se conectar."
+"This follows the same security pattern for the shows: only users assigned to "
+"the show can connect."
+msgstr ""
+"Este segue o mesmo padrão de segurança para os programas: apenas usuários "
+"designados para o programa poderão se conectar."
 
 #: airtime_mvc/application/controllers/LocaleController.php:183
 msgid "Specify custom authentication which will work only for this show."
-msgstr "Defina uma autenticação personalizada que funcionará apenas neste programa."
+msgstr ""
+"Defina uma autenticação personalizada que funcionará apenas neste programa."
 
 #: airtime_mvc/application/controllers/LocaleController.php:185
 msgid "The show instance doesn't exist anymore!"
@@ -2875,11 +3097,16 @@ msgid "Warning: Shows cannot be re-linked"
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:187
-msgid "By linking your repeating shows any media items scheduled in any repeat show will also get scheduled in the other repeat shows"
+msgid ""
+"By linking your repeating shows any media items scheduled in any repeat show "
+"will also get scheduled in the other repeat shows"
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:188
-msgid "Timezone is set to the station timezone by default. Shows in the calendar will be displayed in your local time defined by the Interface Timezone in your user settings."
+msgid ""
+"Timezone is set to the station timezone by default. Shows in the calendar "
+"will be displayed in your local time defined by the Interface Timezone in "
+"your user settings."
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:192
@@ -3036,8 +3263,11 @@ msgid "month"
 msgstr "mês"
 
 #: airtime_mvc/application/controllers/LocaleController.php:254
-msgid "Shows longer than their scheduled time will be cut off by a following show."
+msgid ""
-msgstr "Um programa com tempo maior que a duração programada será cortado pelo programa seguinte."
+"Shows longer than their scheduled time will be cut off by a following show."
+msgstr ""
+"Um programa com tempo maior que a duração programada será cortado pelo "
+"programa seguinte."
 
 #: airtime_mvc/application/controllers/LocaleController.php:255
 msgid "Cancel Current Show?"
@@ -3106,7 +3336,8 @@ msgid "Cue Editor"
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:289
-msgid "Waveform features are available in a browser supporting the Web Audio API"
+msgid ""
+"Waveform features are available in a browser supporting the Web Audio API"
 msgstr ""
 
 #: airtime_mvc/application/controllers/LocaleController.php:292
@@ -3404,8 +3635,12 @@ msgstr "%s linhas%s copiadas para a área de transferência"
 
 #: airtime_mvc/application/controllers/LocaleController.php:394
 #, php-format
-msgid "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."
+msgid ""
-msgstr "%sVisualizar impressão%sUse a função de impressão do navegador para imprimir esta tabela. Pressione ESC quando terminar."
+"%sPrint view%sPlease use your browser's print function to print this table. "
+"Press escape when finished."
+msgstr ""
+"%sVisualizar impressão%sUse a função de impressão do navegador para imprimir "
+"esta tabela. Pressione ESC quando terminar."
 
 #: airtime_mvc/application/controllers/ShowbuilderController.php:194
 #: airtime_mvc/application/controllers/LibraryController.php:189
@@ -3496,7 +3731,8 @@ msgstr "Você não tem permissão para excluir os itens selecionados."
 
 #: airtime_mvc/application/controllers/LibraryController.php:364
 msgid "Could not delete some scheduled files."
-msgstr "Não foi possível excluir alguns arquivos, por estarem com execução agendada."
+msgstr ""
+"Não foi possível excluir alguns arquivos, por estarem com execução agendada."
 
 #: airtime_mvc/application/controllers/LibraryController.php:404
 #, php-format
@@ -3548,8 +3784,12 @@ msgid "Rebroadcast of show %s from %s at %s"
 msgstr "Retransmissão do programa %s de %s as %s"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
-msgid "Please make sure admin user/password is correct on System->Streams page."
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
-msgstr "Confirme se o nome de usuário / senha do administrador estão corretos na página Sistema > Fluxos."
+msgid ""
+"Please make sure admin user/password is correct on System->Streams page."
+msgstr ""
+"Confirme se o nome de usuário / senha do administrador estão corretos na "
+"página Sistema > Fluxos."
 
 #: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
@@ -3557,26 +3797,33 @@ msgstr "Você não tem permissão para acessar esta funcionalidade."
 
 #: airtime_mvc/application/controllers/ApiController.php:315
 #: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Você não tem permissão para acessar esta funcionalidade."
 
 #: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
 msgid "File does not exist in Airtime."
 msgstr "Arquivo não existe no Airtime."
 
 #: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
 msgid "File does not exist in Airtime"
 msgstr "Arquivo não existe no Airtime."
 
 #: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
 msgid "File doesn't exist in Airtime."
 msgstr "Arquivo não existe no Airtime."
 
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Requisição inválida. Parâmetro não informado."
 
 #: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Requisição inválida. Parâmetro informado é inválido."
 
@@ -3627,12 +3874,14 @@ msgstr "O ponto de saída não pode ser maior que a duração do arquivo"
 #: airtime_mvc/application/models/Playlist.php:843
 #: airtime_mvc/application/models/Playlist.php:868
 msgid "Can't set cue in to be larger than cue out."
-msgstr "A duração do ponto de entrada não pode ser maior que a do ponto de saída."
+msgstr ""
+"A duração do ponto de entrada não pode ser maior que a do ponto de saída."
 
 #: airtime_mvc/application/models/Block.php:935
 #: airtime_mvc/application/models/Playlist.php:887
 msgid "Can't set cue out to be smaller than cue in."
-msgstr "A duração do ponto de saída não pode ser menor que a do ponto de entrada."
+msgstr ""
+"A duração do ponto de saída não pode ser menor que a do ponto de entrada."
 
 #: airtime_mvc/application/models/Webstream.php:157
 msgid "Length needs to be greater than 0 minutes"
@@ -3695,6 +3944,7 @@ msgid "Airtime Password Reset"
 msgstr "Redefinição de Senha do Airtime"
 
 #: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Selecione o País"
 
@@ -3704,11 +3954,15 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:119
 msgid "The schedule you're viewing is out of date! (sched mismatch)"
-msgstr "A programação que você está vendo está desatualizada! (programação incompatível)"
+msgstr ""
+"A programação que você está vendo está desatualizada! (programação "
+"incompatível)"
 
 #: airtime_mvc/application/models/Scheduler.php:124
 msgid "The schedule you're viewing is out of date! (instance mismatch)"
-msgstr "A programação que você está vendo está desatualizada! (instância incompatível)"
+msgstr ""
+"A programação que você está vendo está desatualizada! (instância "
+"incompatível)"
 
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:444
@@ -3736,7 +3990,9 @@ msgid "The show %s has been previously updated!"
 msgstr "O programa %s foi previamente atualizado!"
 
 #: airtime_mvc/application/models/Scheduler.php:178
-msgid "Content in linked shows must be scheduled before or after any one is broadcasted"
+msgid ""
+"Content in linked shows must be scheduled before or after any one is "
+"broadcasted"
 msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:200
@@ -3761,21 +4017,30 @@ msgstr "%s está contido dentro de diretório já monitorado: %s"
 
 #: airtime_mvc/application/models/MusicDir.php:189
 #: airtime_mvc/application/models/MusicDir.php:370
+#: airtime_mvc/application/models/MusicDir.php:368
 #, php-format
 msgid "%s is not a valid directory."
 msgstr "%s não é um diretório válido."
 
 #: airtime_mvc/application/models/MusicDir.php:232
 #, php-format
-msgid "%s is already set as the current storage dir or in the watched folders list"
+msgid ""
-msgstr "%s já está definido como armazenamento atual ou está na lista de diretórios monitorados"
+"%s is already set as the current storage dir or in the watched folders list"
+msgstr ""
+"%s já está definido como armazenamento atual ou está na lista de diretórios "
+"monitorados"
 
 #: airtime_mvc/application/models/MusicDir.php:388
+#: airtime_mvc/application/models/MusicDir.php:386
 #, php-format
-msgid "%s is already set as the current storage dir or in the watched folders list."
+msgid ""
-msgstr "%s já está definido como armazenamento atual ou está  na lista de diretórios monitorados."
+"%s is already set as the current storage dir or in the watched folders list."
+msgstr ""
+"%s já está definido como armazenamento atual ou está  na lista de diretórios "
+"monitorados."
 
 #: airtime_mvc/application/models/MusicDir.php:431
+#: airtime_mvc/application/models/MusicDir.php:429
 #, php-format
 msgid "%s doesn't exist in the watched list."
 msgstr "%s não existe na lista de diretórios monitorados."
@@ -3797,20 +4062,40 @@ msgstr ""
 "Não é possível agendar programas sobrepostos.\n"
 "Nota: Redimensionar um programa repetitivo afeta todas as suas repetições."
 
-#~ msgid "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."
+#: airtime_mvc/application/models/StoredFile.php:1017
-#~ msgstr "O arquivo não foi transferido, há %s MB de espaço livre em disco e o arquivo que você está enviando tem um tamanho de %s MB."
+#, php-format
+msgid ""
+"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."
+msgstr ""
+"O arquivo não foi transferido, há %s MB de espaço livre em disco e o arquivo "
+"que você está enviando tem um tamanho de %s MB."
 
-#~ msgid "can't resize a past show"
+#: airtime_mvc/application/models/ShowInstance.php:257
-#~ msgstr "Não é permitido redimensionar um programa anterior"
+msgid "can't resize a past show"
+msgstr "Não é permitido redimensionar um programa anterior"
 
-#~ msgid "Should not overlap shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
-#~ msgstr "Os programas não devem ser sobrepostos"
+msgid "Should not overlap shows"
+msgstr "Os programas não devem ser sobrepostos"
 
-#~ msgid "Failed to create 'organize' directory."
+#: airtime_mvc/application/models/StoredFile.php:1003
-#~ msgstr "Falha ao criar diretório 'organize'"
+msgid "Failed to create 'organize' directory."
+msgstr "Falha ao criar diretório 'organize'"
 
-#~ msgid "This file appears to be corrupted and will not be added to media library."
+#: airtime_mvc/application/models/StoredFile.php:1026
-#~ msgstr "Este arquivo parece estar corrompido e não será adicionado à biblioteca de mídia."
+msgid ""
+"This file appears to be corrupted and will not be added to media library."
+msgstr ""
+"Este arquivo parece estar corrompido e não será adicionado à biblioteca de "
+"mídia."
 
-#~ msgid "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."
+#: airtime_mvc/application/models/StoredFile.php:1065
-#~ msgstr "O arquivo não foi transferido, esse erro pode ocorrer se o computador não tem espaço suficiente em disco ou o diretório stor não tem as permissões de gravação corretas."
+msgid ""
+"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."
+msgstr ""
+"O arquivo não foi transferido, esse erro pode ocorrer se o computador não "
+"tem espaço suficiente em disco ou o diretório stor não tem as permissões de "
+"gravação corretas."

airtime_mvc/public/index.php

@@ -1,5 +1,15 @@
 <?php
 
+//  Only enable cookie secure if we are supporting https.
+//  Ideally, this would always be on and we would force https,
+//  but the default installation configs are likely to be installed by
+//  amature users on the setup that does not have https.  Forcing
+//  cookie_secure on non https would result in confusing login problems.
+if(!empty($_SERVER['HTTPS'])){
+        ini_set('session.cookie_secure', '1');
+}
+ini_set('session.cookie_httponly', '1');
+
 error_reporting(E_ALL|E_STRICT);
 
 function exception_error_handler($errno, $errstr, $errfile, $errline)

airtime_mvc/public/js/airtime/library/plupload.js

@@ -23,7 +23,10 @@ $(document).ready(function() {
 		multiple_queues : 'true',
 		filters : [
 			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
-		]
+		],
+                multipart_params : {
+                    "csrf_token" : $("#csrf").attr('value'),
+                }
 	});
 
 	uploader = $("#plupload_files").pluploadQueue();

airtime_mvc/public/js/plupload/i18n/ja_JP.js

@@ -0,0 +1,27 @@
+//Japanese
+plupload.addI18n({
+    'Select files' : $.i18n._('Select files'),
+    'Add files to the upload queue and click the start button.' : $.i18n._('Add files to the upload queue and click the start button.'),
+    'Filename' : $.i18n._('Filename'),
+    'Status' : $.i18n._('Status'),
+    'Size' : $.i18n._('Size'),
+    'Add files' : $.i18n._('Add files'),
+    'Stop current upload' : $.i18n._('Stop current upload'),
+    'Start uploading queue' : $.i18n._('Start uploading queue'),
+    'Uploaded %d/%d files': $.i18n._('Uploaded %d/%d files'),
+    'N/A' : $.i18n._('N/A'),
+    'Drag files here.' : $.i18n._('Drag files here.'),
+    'File extension error.': $.i18n._('File extension error.'),
+    'File size error.': $.i18n._('File size error.'),
+    'Init error.': $.i18n._('Init error.'),
+    'HTTP Error.': $.i18n._('HTTP Error.'),
+    'Security error.': $.i18n._('Security error.'),
+    'Generic error.': $.i18n._('Generic error.'),
+    'IO error.': $.i18n._('IO error.'),
+    'Stop Upload': $.i18n._('Stop Upload'),
+    'Add Files': $.i18n._('Add Files'),
+    'Start Upload': $.i18n._('Start Upload'),
+    'Start upload': $.i18n._('Start upload'),
+    '%d files queued': $.i18n._('%d files queued'),
+    "Error: Invalid file extension: " : $.i18n._("Error: Invalid file extension: ")
+});

install_full/ubuntu/airtime-full-install

@@ -29,6 +29,8 @@ echo "----------------------------------------------------"
 
 dist=`lsb_release -is`
 code=`lsb_release -cs`
+apache2 -v | grep "2\.4" > /dev/null
+apacheversion=$?
 
 #enable squeeze backports to get lame packages
 if [ "$dist" = "Debian" -a "$code" = "squeeze" ]; then
@@ -130,16 +132,18 @@ else
     echo "----------------------------------------------------"
     echo "2.1 Apache Config File"
     echo "----------------------------------------------------"
-    if [ ! -f /etc/apache2/sites-available/airtime ]; then
+
+    if [ "$apacheversion" != "1" ]; then
+	airtimeconfigfile="airtime.conf"
+    else
+	airtimeconfigfile="airtime"
+    fi
+
+    if [ ! -f /etc/apache2/sites-available/$airtimeconfigfile ]; then
         echo "Creating Apache config for Airtime..."
 
-        if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
+	cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/$airtimeconfigfile
-	    cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime.conf
+        a2dissite 000-default
-            a2dissite 000-default
-        else
-	    cp $SCRIPTPATH/../apache/airtime-vhost /etc/apache2/sites-available/airtime
-            a2dissite default
-        fi
         a2ensite airtime
     else
         echo "Apache config for Airtime already exists..."
@@ -205,4 +209,4 @@ echo "----------------------------------------------------"
 cd $SCRIPTPATH/../../install_minimal
 # Restart apache to clear php cache
 service apache2 restart
-./airtime-install
+./airtime-install

install_minimal/include/AirtimeInstall.php

@@ -177,6 +177,7 @@ class AirtimeInstall
             }
 
             echo "* Giving Apache permission to access $rp".PHP_EOL;
+            $success = chown($rp, $CC_CONFIG["webServerUser"]);
             $success = chgrp($rp, $CC_CONFIG["webServerUser"]);
             $success = chmod($rp, 0775);
         }