Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling

2015-09-04 11:21:00 -04:00 · 2015-09-04 11:21:00 -04:00 · 1db1af3f2e
commit 1db1af3f2e
parent 34e7c09ab7 68a22ccb49
134 changed files with 119858 additions and 113185 deletions
--- a/airtime_mvc/application/common/Billing.php
+++ b/airtime_mvc/application/common/Billing.php
@ -329,150 +329,4 @@ class Billing
        $result = Billing::makeRequest($credentials["url"], $query_string);
    }

-    /**
-     * Returns an array of the current Airtime Pro plan IDs.
-     * This excludes any old, free, promotional, or custom plans.
-     */
-    public static function getCurrentPaidProductIds()
-    {
-        $products = self::getProducts();
-        $productIds = array();
-        foreach ($products as $k => $p) {
-            array_push($productIds, $p["pid"]);
-        }
-
-        return $productIds;
-    }
-
-    /**
-     * Returns an array of the Awesome August 2015 Promotional plans
-     */
-    public static function getAwesomeAugustPromoProducts()
-    {
-        $credentials = self::getAPICredentials();
-
-        $postfields = array();
-        $postfields["username"] = $credentials["username"];
-        $postfields["password"] = md5($credentials["password"]);
-        $postfields["action"] = "getproducts";
-        $postfields["responsetype"] = "json";
-        //gid is the Airtime product group id on whmcs
-        $postfields["gid"] = WHMCS_AIRTIME_GROUP_ID;
-
-        $query_string = "";
-        foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-        $result = self::makeRequest($credentials["url"], $query_string);
-        $promoProducts = $result["products"]["product"];
-
-        foreach ($promoProducts as $k => $p) {
-            if (strpos($p["name"], "Awesome August 2015") === false) {
-                unset($promoProducts[$k]);
-            }
-        }
-
-        return $promoProducts;
-    }
-
-    /**
-     * Returns the eligible promo plan ID that corresponds to the regular paid plan.
-     *
-     * i.e. if the client wants to upgrade to the Plus plan this function returns the
-     * plan id of the Awesome August 2015 Plus plan.
-     */
-    public static function getEligibleAwesomeAugustPromoPlanId($productName)
-    {
-        $promoPlans = self::getAwesomeAugustPromoProducts();
-        $promoPlanId = "";
-
-        foreach($promoPlans as $k => $p) {
-            if (strpos($p["name"], $productName) !== false) {
-                $promoPlanId = $p["pid"];
-                break;
-            }
-        }
-
-        return $promoPlanId;
-    }
-
-    public static function getProductName($productId)
-    {
-        $products = self::getProducts();
-        $productName = "";
-
-        foreach($products as $k => $p) {
-            if ($p["pid"] == $productId) {
-                $productName = $p["name"];
-                break;
-            }
-        }
-
-        return $productName;
-    }
-
-    public static function isClientEligibleForPromo($newProductId, $newProductBillingCycle)
-    {
-        // use this to check if client is upgrading from an old plan
-        $currentPaidPlanProductIds = self::getCurrentPaidProductIds();
-
-        $currentPlanProduct = self::getClientCurrentAirtimeProduct();
-        $currentPlanProductId = $currentPlanProduct["pid"];
-        $currentPlanBillingCycle = strtolower($currentPlanProduct["billingcycle"]);
-
-        if (self::isClientOnAwesomeAugustPromoPlan($currentPlanProductId)) {
-
-            $newEligiblePromoId = self::getEligibleAwesomeAugustPromoPlanId(
-                self::getProductName($newProductId)
-            );
-
-            if ($newProductBillingCycle == "annually" || $newEligiblePromoId > $currentPlanProductId) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-
-        // if client is on trial plan, YES
-        if ($currentPlanProductId == AIRTIME_PRO_FREE_TRIAL_PLAN_ID) {
-            return true;
-        }
-
-        // if client is currently on monthly or annually or old/free plan AND (upgrading OR  upgrading/downgrading to annual plan), YES
-        if ($currentPlanBillingCycle == "monthly" || $currentPlanBillingCycle == "free account"
-            || $currentPlanBillingCycle == "annually") {
-            // is the client changing billing cycle to annual?
-            if ($newProductBillingCycle == "annually") {
-                return true;
-            }
-
-            // Is the client staying on monthly and upgrading?
-            // This won't hold true if the client is on an old/free plan because the
-            // old/free plan ids are higher than the current paid plan ids.
-            if ($newProductBillingCycle == "monthly" && $newProductId > $currentPlanProductId) {
-                return true;
-            }
-
-            // Is the client staying on monthly and upgrading from an old plan?
-            if ($newProductBillingCycle == "monthly" && !in_array($currentPlanProductId, $currentPaidPlanProductIds)
-                && in_array($newProductId, $currentPaidPlanProductIds)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static function isClientOnAwesomeAugustPromoPlan($currentPlanId)
-    {
-        $promoPlans = self::getAwesomeAugustPromoProducts();
-
-        foreach ($promoPlans as $k => $p) {
-            if ($p["pid"] == $currentPlanId) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
 }
--- a/airtime_mvc/application/common/Timezone.php
+++ b/airtime_mvc/application/common/Timezone.php
@ -18,7 +18,7 @@ class Application_Common_Timezone
            'UTC' => DateTimeZone::UTC
        );

-        $tzlist = array();
+        $tzlist = array(NULL => "Use station default");

        foreach ($regions as $name => $mask) {
            $ids = DateTimeZone::listIdentifiers($mask);
--- a/airtime_mvc/application/common/UsabilityHints.php
+++ b/airtime_mvc/application/common/UsabilityHints.php
@ -55,7 +55,7 @@ class Application_Common_UsabilityHints
                return _("Upload some tracks below to add them to your library!");
            } else {
                return sprintf(_("It looks like you haven't uploaded any audio files yet. %sUpload a file now%s."),
-                    "<a href=\"/Plupload\">",
+                    "<a href=\"/plupload\">",
                    "</a>");
            }
        } else if (!self::isFutureOrCurrentShowScheduled()) {
@ -63,7 +63,7 @@ class Application_Common_UsabilityHints
                return _("Click the 'New Show' button and fill out the required fields.");
            } else {
                return sprintf(_("It looks like you don't have any shows scheduled. %sCreate a show now%s."),
-                    "<a href=\"/Schedule\">",
+                    "<a href=\"/schedule\">",
                    "</a>");
            }
        } else if (self::isCurrentShowEmpty()) {
@ -73,23 +73,23 @@ class Application_Common_UsabilityHints
                    return _("To start broadcasting, cancel the current linked show by clicking on it and selecting 'Cancel Show'.");
                } else {
                    return sprintf(_("Linked shows need to be filled with tracks before it starts. To start broadcasting cancel the current linked show and schedule an unlinked show.
-                    %sCreate an unlinked show now%s."), "<a href=\"/Schedule\">", "</a>");
+                    %sCreate an unlinked show now%s."), "<a href=\"/schedule\">", "</a>");
                }
            } else {
                if ($userIsOnCalendarPage) {
-                    return _("To start broadcasting, click on the current show and select 'Schedule Show'");
+                    return _("To start broadcasting, click on the current show and select 'Schedule Tracks'");
                } else {
                    return sprintf(_("It looks like the current show needs more tracks. %sAdd tracks to your show now%s."),
-                        "<a href=\"/Schedule\">",
+                        "<a href=\"/schedule\">",
                        "</a>");
                }
            }
        } else if (!self::getCurrentShow() && self::isNextShowEmpty()) {
            if ($userIsOnCalendarPage) {
-                return _("Click on the show starting next and select 'Schedule Show'");
+                return _("Click on the show starting next and select 'Schedule Tracks'");
            } else {
                return sprintf(_("It looks like the next show is empty. %sAdd tracks to your show now%s."),
-                    "<a href=\"/Schedule\">",
+                    "<a href=\"/schedule\">",
                    "</a>");
            }
        } else {
--- a/airtime_mvc/application/controllers/BillingController.php
+++ b/airtime_mvc/application/controllers/BillingController.php
@ -10,7 +10,6 @@ class BillingController extends Zend_Controller_Action {
        //Two of the actions in this controller return JSON because they're used for AJAX:
        $ajaxContext = $this->_helper->getHelper('AjaxContext');
        $ajaxContext->addActionContext('vat-validator', 'json')
-                    ->addActionContext('promo-eligibility-check', 'json')
                    ->addActionContext('is-country-in-eu', 'json')
                    ->initContext();
    }
@ -20,33 +19,6 @@ class BillingController extends Zend_Controller_Action {
        $this->_redirect('billing/upgrade');
    }

-    public function promoEligibilityCheckAction()
-    {
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-
-        $request = $this->getRequest();
-        if (!$request->isPost()) {
-            throw new Exception("Must POST data to promoEligibilityCheckAction.");
-        }
-        $data = $request->getPost();
-
-        $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) {
-            $eligible = Billing::isClientEligibleForPromo(
-                $data["newproductid"], $data["newproductbillingcycle"]);
-
-            //Set the return JSON value
-            $this->_helper->json(array("result"=>$eligible));
-        } else {
-            $this->getResponse()->setHttpResponseCode(403);
-            $this->_helper->json(array("result"=>false, "error"=>"CSRF token did not match."));
-        }
-    }
-
    public function upgradeAction()
    {

@ -66,14 +38,6 @@ class BillingController extends Zend_Controller_Action {

            if ($form->isValid($formData)) {

-                // Check if client is eligible for promo and update the new product id if so
-                $eligibleForPromo = Billing::isClientEligibleForPromo(
-                    $formData["newproductid"], $formData["newproductbillingcycle"]);
-                if ($eligibleForPromo) {
-                    $newProductName = Billing::getProductName($formData["newproductid"]);
-                    $formData["newproductid"] = Billing::getEligibleAwesomeAugustPromoPlanId($newProductName);
-                }
-
                $credentials = Billing::getAPICredentials();

                //Check if VAT should be applied or not to this invoice.
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@ -24,95 +24,6 @@ class LibraryController extends Zend_Controller_Action
    public function indexAction()
    {
        $this->_redirect("showbuilder");
-//        $CC_CONFIG = Config::getConfig();
-//
-//        $request = $this->getRequest();
-//        $baseUrl = Application_Common_OsPath::getBaseDir();
-//
-//        $this->view->headScript()->appendFile($baseUrl.'js/blockui/jquery.blockUI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.colReorder.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_playlistbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/media_library.css?'.$CC_CONFIG['airtime_version']);
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']);
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/dataTables.colReorder.min.css?'.$CC_CONFIG['airtime_version']);
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/waveform.css?'.$CC_CONFIG['airtime_version']);
-//
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/observer/observer.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/config.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/curves.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/fades.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/local_storage.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/controls.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/playout.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/track_render.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/track.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/time_scale.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//        $this->view->headScript()->appendFile($baseUrl.'js/waveformplaylist/playlist.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-//
-//        //arbitrary attributes need to be allowed to set an id for the templates.
-//        $this->view->headScript()->setAllowArbitraryAttributes(true);
-//        //$this->view->headScript()->appendScript(file_get_contents(APPLICATION_PATH.'/../public/js/waveformplaylist/templates/bottombar.tpl'),
-//        //		'text/template', array('id' => 'tpl_playlist_cues', 'noescape' => true));
-//
-//        $this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
-//
-//        try {
-//
-//            $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
-//            if (isset($obj_sess->id)) {
-//                $objInfo     = Application_Model_Library::getObjInfo($obj_sess->type);
-//                $obj         = new $objInfo['className']($obj_sess->id);
-//                $userInfo    = Zend_Auth::getInstance()->getStorage()->read();
-//                $user        = new Application_Model_User($userInfo->id);
-//                $isAdminOrPM = $user->isUserType(array(UTYPE_SUPERADMIN, UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
-//
-//                if ($isAdminOrPM || $obj->getCreatorId() == $userInfo->id) {
-//                    $this->view->obj = $obj;
-//                    if ($obj_sess->type == "block") {
-//                        $form = new Application_Form_SmartBlockCriteria();
-//                        $form->startForm($obj_sess->id);
-//                        $this->view->form = $form;
-//                    }
-//                }
-//
-//                $formatter = new LengthFormatter($obj->getLength());
-//                $this->view->length = $formatter->format();
-//                $this->view->type = $obj_sess->type;
-//            }
-//
-//            //get user settings and determine if we need to hide
-//            // or show the playlist editor
-//            $showPlaylist = false;
-//            $data = Application_Model_Preference::getLibraryScreenSettings();
-//            if (!is_null($data)) {
-//                if ($data["playlist"] == "true") {
-//                    $showPlaylist = true;
-//                }
-//            }
-//            $this->view->showPlaylist = $showPlaylist;
-//        } catch (PlaylistNotFoundException $e) {
-//            $this->playlistNotFound($obj_sess->type);
-//        } catch (Exception $e) {
-//            $this->playlistNotFound($obj_sess->type);
-//            Logging::info($e->getMessage());
-//            //$this->playlistUnknownError($e);
-//        }
    }

    protected function playlistNotFound($p_type)
--- a/airtime_mvc/application/controllers/LocaleController.php
+++ b/airtime_mvc/application/controllers/LocaleController.php
@ -51,8 +51,14 @@ class LocaleController extends Zend_Controller_Action
            //library/events/library_showbuilder.js
            //already in library/events/library_playlistbuilder.js
            "Please select a cursor position on timeline." => _("Please select a cursor position on timeline."),
-            "You haven't added any " => _("You haven't added any "),
-            "Learn about " => _("Learn about "),
+            "You haven't added any tracks" => _("You haven't added any tracks"),
+            "You haven't added any playlists" => _("You haven't added any playlists"),
+            "You haven't added any smart blocks" => _("You haven't added any smart blocks"),
+            "You haven't added any webstreams" => _("You haven't added any webstreams"),
+            "Learn about tracks" => _("Learn about tracks"),
+            "Learn about playlists" => _("Learn about playlists"),
+            "Learn about smart blocks" => _("Learn about smart blocks"),
+            "Learn about webstreams" => _("Learn about webstreams"),
            "Click 'New' to create one." => _("Click 'New' to create one."),
            //"Adding 1 Item" => _("Adding 1 Item"),
            //"Adding %s Items" => _("Adding %s Items"),
@ -267,6 +273,9 @@ class LocaleController extends Zend_Controller_Action
            "Start" => _("Start"),
            "End" => _("End"),
            "Duration" => _("Duration"),
+            "Filtering out " => _("Filtering out "),
+            " of " => _(" of "),
+            " records" => _(" records"),
            //already in library/library.js
            //"Title" => _("Title"),
            //"Creator" => _("Creator"),
--- a/airtime_mvc/application/controllers/PlaylistController.php
+++ b/airtime_mvc/application/controllers/PlaylistController.php
@ -30,6 +30,7 @@ class PlaylistController extends Zend_Controller_Action
                    ->addActionContext('get-block-info', 'json')
                    ->addActionContext('shuffle', 'json')
                    ->addActionContext('empty-content', 'json')
+                    ->addActionContext('change-playlist', 'json')
                    ->initContext();

        //This controller writes to the session all over the place, so we're going to reopen it for writing here.
@ -201,6 +202,16 @@ class PlaylistController extends Zend_Controller_Action
        $this->createFullResponse($obj);
    }

+    public function changePlaylistAction() {
+        $this->view->layout()->disableLayout();  // Don't inject the standard Now Playing header.
+        $this->_helper->viewRenderer->setNoRender(true);  // Don't use (phtml) templates
+
+        $id = $this->_getParam('id', null);
+        $type = $this->_getParam('type');
+
+        Application_Model_Library::changePlaylist($id, $type);
+    }
+
    public function editAction()
    {
        $id = $this->_getParam('id', null);
@ -241,7 +252,7 @@ class PlaylistController extends Zend_Controller_Action
            Logging::info("Currently active {$type} {$obj_sess->id}");
            if (in_array($obj_sess->id, $ids)) {
                Logging::info("Deleting currently active {$type}");
-                Application_Model_Library::changePlaylist(null, $type);
+                // Application_Model_Library::changePlaylist(null, $type);
            } else {
                Logging::info("Not deleting currently active {$type}");
                $obj = new $objInfo['className']($obj_sess->id);
@ -595,10 +606,7 @@ class PlaylistController extends Zend_Controller_Action
                $this->view->obj = $bl;
                $this->view->id = $bl->getId();
                $this->view->form = $form;
-                $viewPath = 'playlist/smart-block.phtml';
-                $result['html'] = $this->view->render($viewPath);
-                $result['result'] = 1;
-                $this->_helper->json->sendJson($result);
+                $this->createFullResponse($bl, false, true);
            }
        } catch (BlockNotFoundException $e) {
            $this->playlistNotFound('block', true);
--- a/airtime_mvc/application/controllers/PluploadController.php
+++ b/airtime_mvc/application/controllers/PluploadController.php
@ -26,6 +26,7 @@ class PluploadController extends Zend_Controller_Action

        $this->view->headLink()->appendStylesheet($baseUrl.'css/plupload.queue.css?'.$CC_CONFIG['airtime_version']);
        $this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'css/dashboard.css?'.$CC_CONFIG['airtime_version']);

        $this->view->quotaLimitReached = false;
        if (Application_Model_Systemstatus::isDiskOverQuota()) {
--- a/airtime_mvc/application/controllers/plugins/Acl_plugin.php
+++ b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
@ -82,7 +82,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
     * @param  string $module
     * @return void
     **/
-    public function setErrorPage($action, $controller = 'error', $module = null)
+    public function setErrorPage($action, $controller = 'error', $module = 'default')
    {
        $this->_errorPage = array('module' => $module,
                                  'controller' => $controller,
@ -204,7 +204,8 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
                        $resourceName, 
                        $request->getActionName())) {
                /** Redirect to access denied page */
-                $this->denyAccess();
+                $this->setErrorPage('error403');
+                $this->denyAccess(); /* This results in a 404! */
            }
        }
    }
--- a/airtime_mvc/application/forms/BillingClient.php
+++ b/airtime_mvc/application/forms/BillingClient.php
@ -14,7 +14,7 @@ class Application_Form_BillingClient extends Zend_Form
        $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
        
        $firstname = new Zend_Form_Element_Text('firstname');
-        $firstname->setLabel(_('First Name:'))
+        $firstname->setLabel(_pro('First Name:'))
            ->setValue($client["firstname"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -23,7 +23,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($firstname);

        $lastname = new Zend_Form_Element_Text('lastname');
-        $lastname->setLabel(_('Last Name:'))
+        $lastname->setLabel(_pro('Last Name:'))
            ->setValue($client["lastname"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -32,7 +32,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($lastname);

        $companyname = new Zend_Form_Element_Text('companyname');
-        $companyname->setLabel(_('Company Name:'))
+        $companyname->setLabel(_pro('Company Name:'))
            ->setValue($client["companyname"])
            ->setAttrib('class', 'input_text')
            ->setRequired(false)
@ -41,7 +41,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($companyname);

        $email = new Zend_Form_Element_Text('email');
-        $email->setLabel(_('Email Address:'))
+        $email->setLabel(_pro('Email Address:'))
            ->setValue($client["email"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -51,7 +51,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($email);

        $address1 = new Zend_Form_Element_Text('address1');
-        $address1->setLabel(_('Address 1:'))
+        $address1->setLabel(_pro('Address 1:'))
            ->setValue($client["address1"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -60,14 +60,14 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($address1);

        $address2 = new Zend_Form_Element_Text('address2');
-        $address2->setLabel(_('Address 2:'))
+        $address2->setLabel(_pro('Address 2:'))
            ->setValue($client["address2"])
            ->setAttrib('class', 'input_text')
            ->addFilter('StringTrim');
        $this->addElement($address2);

        $city = new Zend_Form_Element_Text('city');
-        $city->setLabel(_('City:'))
+        $city->setLabel(_pro('City:'))
            ->setValue($client["city"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -77,7 +77,7 @@ class Application_Form_BillingClient extends Zend_Form

        //TODO: get list from whmcs?
        $state = new Zend_Form_Element_Text('state');
-        $state->setLabel(_('State/Region:'))
+        $state->setLabel(_pro('State/Region:'))
            ->setValue($client["state"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -86,7 +86,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($state);

        $postcode = new Zend_Form_Element_Text('postcode');
-        $postcode->setLabel(_('Zip Code / Postal Code:'))
+        $postcode->setLabel(_pro('Zip Code / Postal Code:'))
            ->setValue($client["postcode"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -99,7 +99,7 @@ class Application_Form_BillingClient extends Zend_Form
        asort($countries, SORT_LOCALE_STRING);
        
        $country = new Zend_Form_Element_Select('country');
-        $country->setLabel(_('Country:'))
+        $country->setLabel(_pro('Country:'))
            ->setValue($client["country"])
            ->setAttrib('class', 'input_text')
            ->setMultiOptions($countries)
@ -109,7 +109,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($country);

        $phonenumber = new Zend_Form_Element_Text('phonenumber');
-        $phonenumber->setLabel(_('Phone Number:'))
+        $phonenumber->setLabel(_pro('Phone Number:'))
            ->setValue($client["phonenumber"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -118,7 +118,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($phonenumber);

        $securityqid = new Zend_Form_Element_Select('securityqid');
-        $securityqid->setLabel(_('Please choose a security question:'))
+        $securityqid->setLabel(_pro('Please choose a security question:'))
            ->setValue($client["securityqid"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -132,7 +132,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($securityqid);

        $securityqans = new Zend_Form_Element_Text('securityqans');
-        $securityqans->setLabel(_('Please enter an answer:'))
+        $securityqans->setLabel(_pro('Please enter an answer:'))
            ->setValue($client["securityqans"])
            ->setAttrib('class', 'input_text')
            ->setRequired(true)
@ -149,7 +149,7 @@ class Application_Form_BillingClient extends Zend_Form
        }

        $vat = new Zend_Form_Element_Text("7");
-        $vat->setLabel(_('VAT/Tax ID (EU only)'))
+        $vat->setLabel(_pro('VAT/Tax ID (EU only)'))
            ->setBelongsTo('customfields')
            ->setValue($vatvalue)
            ->setAttrib('class', 'input_text')
@ -159,7 +159,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($vat);

        $subscribe = new Zend_Form_Element_Checkbox('71');
-        $subscribe->setLabel(_('Subscribe to Sourcefabric newsletter'))
+        $subscribe->setLabel(_pro('Subscribe to Sourcefabric newsletter'))
            ->setValue($subscribevalue)
            ->setBelongsTo('customfields')
            ->setAttrib('class', 'billing-details-checkbox')
@ -169,7 +169,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($subscribe);

        $password = new Zend_Form_Element_Password('password2');
-        $password->setLabel(_('Password:'));
+        $password->setLabel(_pro('Password:'));
        $password->setAttrib('class', 'input_text');
        $password->setValue("xxxxxx");
        $password->setRequired(true);
@ -178,7 +178,7 @@ class Application_Form_BillingClient extends Zend_Form
        $this->addElement($password);

        $passwordVerify = new Zend_Form_Element_Password('password2verify');
-        $passwordVerify->setLabel(_('Verify Password:'));
+        $passwordVerify->setLabel(_pro('Verify Password:'));
        $passwordVerify->setAttrib('class', 'input_text');
        $passwordVerify->setValue("xxxxxx");
        $passwordVerify->setRequired(true);
@ -190,7 +190,7 @@ class Application_Form_BillingClient extends Zend_Form

        $submit = new Zend_Form_Element_Submit("submit");
        $submit->setIgnore(true)
-                ->setLabel(_("Save"));
+                ->setLabel(_pro("Save"));
        $this->addElement($submit);
    }
 }
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@ -121,11 +121,14 @@ class Application_Form_EditUser extends Zend_Form
        $locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId));
        $locale->setDecorators(array('ViewHelper'));
        $this->addElement($locale);
-        
+
+        $stationTz = Application_Model_Preference::GetTimezone($currentUserId);
+        $userTz = Application_Model_Preference::GetUserTimezone($currentUserId);
+
        $timezone = new Zend_Form_Element_Select("cu_timezone");
        $timezone->setLabel(_("Interface Timezone:"));
        $timezone->setMultiOptions(Application_Common_Timezone::getTimezones());
-        $timezone->setValue(Application_Model_Preference::GetUserTimezone($currentUserId));
+        $timezone->setValue($userTz == $stationTz ? null : $userTz);
        $timezone->setDecorators(array('ViewHelper'));
        $this->addElement($timezone);
        
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@ -1,4 +1,4 @@
-<?php
+    <?php

 require_once 'customfilters/ImageSize.php';

--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@ -37,19 +37,17 @@ class Application_Form_Login extends Zend_Form
        ));

        // Add username element
-        $this->addElement('text', 'username', array(
-            'label'      => _('Username:'),
-            'class'      => 'input_text',
-            'required'   => true,
-            'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
-            'filters'    => array('StringTrim'),
-            'validators' => array(
-                'NotEmpty',
-            ),
-            'decorators' => array(
-                'ViewHelper'
-            )
-        ));
+        $username = new Zend_Form_Element_Text("username");
+        $username->setLabel(_('Username:'))
+            ->setAttribs(array(
+                'autofocus' => 'true',
+                'class' => 'input_text',
+                'required' => 'true'))
+            ->setValue((isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'')
+            ->addFilter('StringTrim')
+            ->setDecorators(array('ViewHelper'))
+            ->setValidators(array('NotEmpty'));
+        $this->addElement($username);

        // Add password element
        $this->addElement('password', 'password', array(
--- a/airtime_mvc/application/forms/SmartBlockCriteria.php
+++ b/airtime_mvc/application/forms/SmartBlockCriteria.php
@ -370,6 +370,10 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm
        // add elelments that needs to be added
        // set multioption for modifier according to criteria_field
        $modRowMap = array();
+        if (!isset($data['criteria'])) {
+            return $data;
+        }
+
        foreach ($data['criteria'] as $critKey=>$d) {
            $count = 1;
            foreach ($d as $modKey=>$modInfo) {
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@ -67,7 +67,9 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
            </li>
        </ul>
        <a href="/Plupload">
-            <button id="add_media_btn" class="btn btn-small dashboard-btn">Upload</button>
+            <button id="add_media_btn" class="btn btn-small dashboard-btn btn-new">
+                <span><?php echo _("Upload") ?></span>
+            </button>
        </a>
    </div>
    <div class="media_type_selector top-link" data-selection-id="1">
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@ -1517,27 +1517,27 @@ SQL;
                    $i++;
                }
            }
-
-            // check if file exists
-            $qry->add("file_exists", "true", Criteria::EQUAL);
-            $qry->add("hidden", "false", Criteria::EQUAL);
-            $sortTracks = 'random';
-            if (isset($storedCrit['sort'])) {
-                $sortTracks = $storedCrit['sort']['value'];
-            }
-            if ($sortTracks == 'newest') {
-                $qry->addDescendingOrderByColumn('utime');
-            }
-            else if ($sortTracks == 'oldest') {
-                $qry->addAscendingOrderByColumn('utime');
-            }
-            else if ($sortTracks == 'random') {
-                $qry->addAscendingOrderByColumn('random()');
-            } else {
-                Logging::warning("Unimplemented sortTracks type in ".__FILE__);
-            }
-
        }
+
+        // check if file exists
+        $qry->add("file_exists", "true", Criteria::EQUAL);
+        $qry->add("hidden", "false", Criteria::EQUAL);
+        $sortTracks = 'random';
+        if (isset($storedCrit['sort'])) {
+            $sortTracks = $storedCrit['sort']['value'];
+        }
+        if ($sortTracks == 'newest') {
+            $qry->addDescendingOrderByColumn('utime');
+        }
+        else if ($sortTracks == 'oldest') {
+            $qry->addAscendingOrderByColumn('utime');
+        }
+        else if ($sortTracks == 'random') {
+            $qry->addAscendingOrderByColumn('random()');
+        } else {
+            Logging::warning("Unimplemented sortTracks type in ".__FILE__);
+        }
+
        // construct limit restriction
        $limits = array();
        
--- a/airtime_mvc/application/models/Datatables.php
+++ b/airtime_mvc/application/models/Datatables.php
@ -69,8 +69,7 @@ class Application_Model_Datatables

        if (isset($data['advSearch']) && $data['advSearch'] === 'true') {

-            $librarySetting =
-            Application_Model_Preference::getCurrentLibraryTableColumnMap();
+            $librarySetting = Application_Model_Preference::getCurrentLibraryTableColumnMap();
            //$displayColumns[] = 'owner';

            // map that maps original column position to db name
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@ -28,7 +28,9 @@ class Application_Model_Preference
    {
        $cache = new Cache();
        $con = Propel::getConnection(CcPrefPeer::DATABASE_NAME);
-        $con->beginTransaction();
+
+        //We are using row-level locking in Postgres via "FOR UPDATE" instead of a transaction here
+        //because sometimes this function needs to be called while a transaction is already started.

        try {
            /* Comment this out while we reevaluate it in favor of a unique constraint
@ -40,7 +42,7 @@ class Application_Model_Preference
            }

            //Check if key already exists
-            $sql = "SELECT COUNT(*) FROM cc_pref"
+            $sql = "SELECT valstr FROM cc_pref"
                ." WHERE keystr = :key";
            
            $paramMap = array();
@ -50,12 +52,14 @@ class Application_Model_Preference
            if ($isUserValue) {
                $sql .= " AND subjid = :id";
                $paramMap[':id'] = $userId;
-            } 
+            }
+
+            $sql .= " FOR UPDATE";

            $result = Application_Common_Database::prepareAndExecute($sql, 
                    $paramMap, 
-                    Application_Common_Database::COLUMN,
-                    PDO::FETCH_ASSOC, 
+                    Application_Common_Database::ROW_COUNT,
+                    PDO::FETCH_ASSOC,
                    $con);

            $paramMap = array();
@ -98,14 +102,12 @@ class Application_Model_Preference
            $paramMap[':value'] = $value;

            Application_Common_Database::prepareAndExecute($sql, 
-                    $paramMap, 
-                    'execute', 
+                    $paramMap,
+                    Application_Common_Database::EXECUTE,
                    PDO::FETCH_ASSOC, 
                    $con);

-            $con->commit();
        } catch (Exception $e) {
-            $con->rollback();
            header('HTTP/1.0 503 Service Unavailable');
            Logging::info("Database error: ".$e->getMessage());
            exit;
@ -477,10 +479,6 @@ class Application_Model_Preference

    public static function SetUserTimezone($timezone = null)
    {
-        // When a new user is created they will get the default timezone
-        // setting which the admin sets on preferences page
-        if (is_null($timezone))
-            $timezone = self::GetDefaultTimezone();
        self::setValue("user_timezone", $timezone, true);
    }

@ -520,10 +518,10 @@ class Application_Model_Preference
    public static function GetUserLocale()
    {
        $locale = self::getValue("user_locale", true);
-        if (!$locale) {
+        // empty() checks for null and empty strings - more robust than !val
+        if (empty($locale)) {
            return self::GetDefaultLocale();
-        } 
-        else {
+        } else {
            return $locale;
        }
    }
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@ -847,14 +847,24 @@ SQL;
     */
    public static function createAndFillShowInstancesPastPopulatedUntilDate($needScheduleUntil)
    {
-        //UTC DateTime object
-        $showsPopUntil = Application_Model_Preference::GetShowsPopulatedUntil();
-        //if application is requesting shows past our previous populated until date, generate shows up until this point.
-        if (is_null($showsPopUntil) || $showsPopUntil->getTimestamp() < $needScheduleUntil->getTimestamp()) {
-            $service_show = new Application_Service_ShowService();
-            $ccShow = $service_show->delegateInstanceCreation(null, $needScheduleUntil, true);
-            Application_Model_Preference::SetShowsPopulatedUntil($needScheduleUntil);
+        $con = Propel::getConnection(CcPrefPeer::DATABASE_NAME);
+        try {
+            $con->beginTransaction();
+
+            //UTC DateTime object
+            $showsPopUntil = Application_Model_Preference::GetShowsPopulatedUntil();
+            //if application is requesting shows past our previous populated until date, generate shows up until this point.
+            if (is_null($showsPopUntil) || $showsPopUntil->getTimestamp() < $needScheduleUntil->getTimestamp()) {
+                $service_show = new Application_Service_ShowService();
+                $ccShow = $service_show->delegateInstanceCreation(null, $needScheduleUntil, true);
+                Application_Model_Preference::SetShowsPopulatedUntil($needScheduleUntil);
+            }
+            $con->commit();
+        } catch (Exception $e) {
+            $con->rollBack();
+            throw $e;
        }
+
    }

    /**
--- a/airtime_mvc/application/services/CalendarService.php
+++ b/airtime_mvc/application/services/CalendarService.php
@ -78,7 +78,7 @@ class Application_Service_CalendarService

                    $menu["schedule"] = array(
                        // "name"=> _("Add / Remove Content"),
-                        "name" => _("Schedule Show"),
+                        "name" => _("Schedule Tracks"),
                        "icon" => "add-remove-content",
                        "url" => $baseUrl."showbuilder/builder-dialog/");
                }
@ -142,7 +142,8 @@ class Application_Service_CalendarService
                if ($isRepeating) {
                    if ($populateInstance) {
                        $menu["edit"] = array(
-                            "name" => _("Edit This Instance"),
+                            // "name" => _("Edit This Instance"),
+                            "name" => _("Edit Instance"),
                            "icon" => "edit",
                            "url" => $baseUrl . "Schedule/populate-repeating-show-instance-form"
                        );
@ -160,7 +161,8 @@ class Application_Service_CalendarService
                        );

                        $menu["edit"]["items"]["instance"] = array(
-                            "name" => _("Edit This Instance"),
+                            // "name" => _("Edit This Instance"),
+                            "name" => _("Edit Instance"),
                            "icon" => "edit",
                            "url" => $baseUrl . "Schedule/populate-repeating-show-instance-form"
                        );
@ -188,12 +190,14 @@ class Application_Service_CalendarService
                        "items" => array());

                    $menu["del"]["items"]["single"] = array(
-                        "name"=> _("Delete This Instance"),
+                        // "name"=> _("Delete This Instance"),
+                        "name"=> _("Delete Instance"),
                        "icon" => "delete",
                        "url" => $baseUrl."schedule/delete-show-instance");

                    $menu["del"]["items"]["following"] = array(
-                        "name"=> _("Delete This Instance and All Following"),
+                        // "name"=> _("Delete This Instance and All Following"),
+                        "name"=> _("Delete Instance and All Following"),
                        "icon" => "delete",
                        "url" => $baseUrl."schedule/delete-show");
                } elseif ($populateInstance) {
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
@ -120,30 +120,6 @@ function configureByCountry(countryCode)
 	});
 }

-function promoEligibilityCheck()
-{
-    var newproductid = $("input[type='radio'][name='newproductid']:checked").val();
-
-    // newproductid can be undefined if the client is currently on an old plan
-    // and they just change the billing cycle value without selecting a new plan type.
-    // In this case, let's not check if they are eligible for the promo because
-    // they won't be able to upgrade without selecting a new plan first.
-    if (newproductid === undefined) {
-        return;
-    }
-    var newproductbillingcycle = $("input[type='radio'][name='newproductbillingcycle']:checked").val();
-
-    $.post("/billing/promo-eligibility-check", {"newproductid": newproductid,
-        "newproductbillingcycle": newproductbillingcycle, "csrf_token": $("#csrf").attr('value')})
-        .success(function(data) {
-            if (data.result == true) {
-                $("#promo-plan-eligible").show();
-            } else if ($("#promo-plan-eligible").is(":visible")) {
-                $("#promo-plan-eligible").hide();
-            }
-    });
-}
-
 $(document).ready(function() {
 	
 	configureByCountry($("#country").val());
@ -152,11 +128,9 @@ $(document).ready(function() {
    $("input[name='newproductid']").change(function() {
        validatePlan();
        recalculateTotals();
-        promoEligibilityCheck();
    });
    $("input[name='newproductbillingcycle']").change(function() {
    	recalculateTotals();
-        promoEligibilityCheck();
    });

    $("#country").change(function() {
@ -194,19 +168,15 @@ $(document).ready(function() {
 </script>

 <div class="ui-widget prefpanel clearfix padded-strong billing-panel">
-<H2><?=_("Account Plans")?></H2>
-<H4><?=_("Upgrade today to get more listeners and storage space!")?></H4>
-<div>
-        <a href="https://www.airtime.pro/pricing#promo-details" target="_blank">
-            <img width="400px" height="133px" class="promo-banner" /></a>
-    </div>
+<H2><?=_pro("Account Plans")?></H2>
+<H4><?=_pro("Upgrade today to get more listeners and storage space!")?></H4>
 <div class="pricing-grid">
    <table>
        <tr>
-            <th>Awesome Hobbyist</th>
-            <th>Awesome Starter</th>
-            <th>Awesome Plus</th>
-            <th>Awesome Premium</th>
+            <th>Hobbyist</th>
+            <th>Starter</th>
+            <th>Plus</th>
+            <th>Premium</th>
        </tr>
        <tr>
            <td>1 Stream
@ -228,40 +198,25 @@ $(document).ready(function() {
            <td class="last-column">64kbps, 128kbps, and 196kbps Stream Quality
            </td>
        </tr> 
-        <tr class="august-promo">
-            <td>
-                <span>5 Listeners</span><br>
-                <div>10 Listeners</div>
+        <tr>
+            <td>5 Listeners
            </td>
-            <td>
-                <span>40 Listeners per stream</span><br>
-                <div>80 Listeners per stream</div>
+            <td>40 Listeners per stream
            </td>
-            <td>
-                <span>100 Listeners per stream</span><br>
-                <div>200 Listeners per stream</div>
+            <td>100 Listeners per stream
            </td>
-            <td class="last-column">
-                <span>500 Listeners per stream</span><br>
-                <div>1000 Listeners per stream</div>
+            <td class="last-column">500 Listeners per stream
            </td>
        </tr> 
-        <tr class="august-promo">
-            <td>
-                <span>2GB Storage</span><br>
-                <div>4GB Storage</div>
+        <tr>
+            <td>2GB Storage
            </td>
-            <td>
-                <span>5GB Storage</span><br>
-                <div>10GB Storage</div>
+            <td>5GB Storage
            </td>
-            <td>
-                <span>30GB Storage</span><br>
-                <div>60GB Storage</div>
+            <td>30GB Storage
            </td>
            <td class="last-column">
-                <span>150GB Storage</span><br>
-                <div>300GB Storage</div>
+                150GB Storage
            </td>
        </tr> 
        <tr>
@ -297,9 +252,9 @@ $(document).ready(function() {
    </table>
 </div>
 <!-- 
-<p> <a target="_blank" href="https://www.airtime.pro/pricing"><?=_("View Plans")?></a> (Opens in a new window)</p>
+<p> <a target="_blank" href="https://www.airtime.pro/pricing"><?=_pro("View Plans")?></a> (Opens in a new window)</p>
 -->
-<p id="current_plan"><span>Your Current Plan:</span>
+<p id="current_plan"><span><?php echo(_pro('Your Current Plan:')); ?></span>
 <?php 
 $currentProduct = Billing::getClientCurrentAirtimeProduct();
 echo($currentProduct["name"]);
@ -307,7 +262,7 @@ echo($currentProduct["name"]);
 ?>
 </p>

-<h3>Choose a plan:</h3>
+<h3>echo(_pro('Choose a plan: ')); ?></h3>
 <form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
    $form->getAction()?>" enctype="<?php echo $form->getEncType();?>">

@ -320,12 +275,8 @@ echo($currentProduct["name"]);
        <?php echo $form->newproductbillingcycle ?>
    </div>
    <div id="billingcycle_disclaimer">
-    Save 15% on annual plans (Hobbyist plan excluded).
+        Save 15% on annual plans (Hobbyist plan excluded).
    </div>
-     <div class="clearfix"></div>
-     <div id="promo-plan-eligible" style="display:none;">
-         Congratulations, you are eligible for an Awesome Promotional Plan!
-     </div>
    <div class="clearfix"></div>
    <div id="subtotal_box">
        <b>Subtotal:</b><br>
@ -337,7 +288,7 @@ echo($currentProduct["name"]);
    VAT will be added below if you are an EU resident without a valid VAT number.
    </div>
    
-    <h3>Enter your payment details:</h3>
+    <h3><?=_pro("Please enter your payment details:");?></h3>
    <?php if (isset($this->errorMessage)) {?>
    <div class="errors"><?php echo $this->errorMessage ?></div>
    <?php }?>
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@ -4,7 +4,7 @@
    <?php echo $this->element->getElement('sb_date_end'); ?>
    <?php echo $this->element->getElement('sb_time_end'); ?>
    <a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range">
-        <i class="icon-white icon-search"></i><?php echo " "._("Find Shows") ?>
+        <i class="icon-white icon-search"></i><span><?php echo _("Find Shows") ?></span>
    </a>

    <?php echo $this->element->getElement('sb_show_filter') ?>
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@ -89,9 +89,9 @@
                }
                $nextDisabled = $this->element->getElement("sp_criteria_field_".$nextIndex)->getAttrib('disabled') == 'disabled'?true:false;
        ?>
-            <div <?php if (($i > 0) && $disabled) {
-                           echo 'style=display:none';
-                       } ?>>
+            <div <?php if (/*($i > 0) && */ $disabled) {
+                          echo 'style=display:none';
+                      } ?> >
                <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
                <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j) ?>
                <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
@ -6,7 +6,7 @@
           <div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
      </div>
      <div class="trial-box-button">
-            <a title="<?php echo sprintf(_("Purchase an %s Pro plan!"), PRODUCT_NAME)?>" href="/billing/upgrade"><?php echo _("My Account") ?></a>
+            <a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="/billing/upgrade"><?php echo _pro("My Account") ?></a>
      </div>
  </div>
 <?php }?> 
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@ -18,7 +18,7 @@
    <div id="plupload_files"></div>	
 </form>
 -->
-<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded wide-panel <?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
+<div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded content-pane wide-panel<?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
    <?php
    $partitions = Application_Model_Systemstatus::GetDiskInfo();
    $status = new StdClass;
@ -58,7 +58,7 @@
 	<table></table>
 </div>

-<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow wide-panel">
+<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow content-pane wide-panel">
    <div id="recent_uploads" class="outer-datatable-wrapper padded">
        <div id="recent_uploads_filter">
            <form>
@ -68,10 +68,8 @@
            </form>        
        </div>
        <H2><?php echo _("Recent Uploads")?></H2>
-        <div class="dataTables_scrolling">
        <table id="recent_uploads_table" class="datatable lib-content ui-widget ui-widget-content block-shadow"
               cellpadding="0" cellspacing="0"></table>
-        </div>
    </div>
    <div style="clear: both;"></div>
 </div>
--- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
@ -7,6 +7,7 @@
    <div class="panel-header">
        <div id="advanced-options" class="btn-group">
            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+                <span id="filter_message"></span>
                <span class="caret"></span>
            </button>
            <div id="advanced_search" class="advanced_search form-horizontal dropdown-menu"></div>
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@ -353,7 +353,9 @@ INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文'
 -- added in 2.5.2

 INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', 'UTC');
-INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', 'UTC');
+-- We don't want to set the user timezone by default - it should instead use the station timezone
+-- until the user changes it manually.
+-- INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', 'UTC');

 INSERT INTO cc_pref (keystr, valstr) VALUES ('import_timestamp', '0');

--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/az/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hy/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ja/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ka/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po
@ -1,7 +1,152 @@
+#: airtime_mvc/application/controllers/LoginController.php:170
+#, php-format
+msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
+#, php-format
+msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/password-restore.phtml:4
+#, php-format
+msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
+msgid "Thank you!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
+msgid "Your station has been upgraded successfully."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
+msgid "Return to Airtime"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+#, php-format
+msgid "Purchase an %s plan!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "My Account"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:171
+msgid "Account Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:172
+msgid "Upgrade today to get more listeners and storage space!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:255
+msgid "View Plans"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:257
+msgid "Your Current Plan:"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:291
+msgid "Please enter your payment details:"
+msgstr ""
+
 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
 msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
 msgstr ""

 #: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\"<br> and look for the \"Checkout\" button."
+msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:17
+msgid "First Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:26
+msgid "Last Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:35
+msgid "Company Name:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:44
+msgid "Email Address:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:54
+msgid "Address 1:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:63
+msgid "Address 2:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:70
+msgid "City:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:80
+msgid "State/Region:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:89
+msgid "Zip Code / Postal Code:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:102
+msgid "Country:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:112
+msgid "Phone Number:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:121
+msgid "Please choose a security question:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:135
+msgid "Please enter an answer:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:152
+msgid "VAT/Tax ID (EU only)"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:162
+msgid "Subscribe to Sourcefabric newsletter"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:172
+msgid "Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:181
+msgid "Verify Password:"
+msgstr ""
+
+#: airtime_mvc/application/forms/BillingClient.php:193
+msgid "Save"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:35
+#, php-format
+msgid ""
+"\n"
+"\n"
+"If you have any problems, please contact our support team: %s"
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+#, php-format
+msgid ""
+"\n"
+"\n"
+"Thank you,\n"
+"The %s Team"
 msgstr ""
--- a/Show more
+++ b/Show more