diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index 455b64c6a..636e0c15b 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -3,7 +3,10 @@ require_once __DIR__."/configs/conf.php";
 $CC_CONFIG = Config::getConfig();
 
 require_once __DIR__."/configs/ACL.php";
-require_once 'propel/propel1/runtime/lib/Propel.php';
+if (!@include_once('propel/propel1/runtime/lib/Propel.php'))
+{
+    die('Error: Propel not found. Did you install Airtime\'s third-party dependencies with composer? (Check the README.)');
+}
 
 Propel::init(__DIR__."/configs/airtime-conf-production.php");
 
diff --git a/airtime_mvc/application/amazon/Amazon_S3.php b/airtime_mvc/application/amazon/Amazon_S3.php
deleted file mode 100644
index ea8a3e055..000000000
--- a/airtime_mvc/application/amazon/Amazon_S3.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-require_once 'Zend/Service/Amazon/S3.php';
-
-/**
- * 
- * This is a wrapper class for Zend_Service_Amazon_S3.
- * Zend_Service_Amazon_S3 doesn't have getters and setters for the bucket,
- * access key, or secret key. This functionality would greatly refine our
- * use of the service so we decided to write our own here.
- *
- */
-class Amazon_S3
-{
-    private $bucket;
-    private $accessKey;
-    private $secretKey;
-    private $zendServiceAmazonS3;
-    
-    function Amazon_S3()
-    {
-        $this->initZendServiceAmazonS3();
-    }
-    
-    private function initZendServiceAmazonS3()
-    {
-        $CC_CONFIG = Config::getConfig();
-        
-        $this->setBucket($CC_CONFIG['cloud_storage']['bucket']);
-        $this->setAccessKey($CC_CONFIG['cloud_storage']['api_key']);
-        $this->setSecretKey($CC_CONFIG['cloud_storage']['api_key_secret']);
-        
-        $this->zendServiceAmazonS3 = new Zend_Service_Amazon_S3(
-            $this->getAccessKey(),
-            $this->getSecretKey());
-    }
-    
-    public function getZendServiceAmazonS3()
-    {
-    	return $this->zendServiceAmazonS3;
-    }
-    
-    public function getBucket()
-    {
-        return $this->bucket;
-    }
-    
-    private function setBucket($bucket)
-    {
-        $this->bucket = $bucket;
-    }
-    
-    public function getAccessKey()
-    {
-        return $this->accessKey;
-    }
-    
-    private function setAccessKey($accessKey)
-    {
-        $this->accessKey = $accessKey;
-    }
-    
-    public function getSecretKey()
-    {
-        return $this->secretKey;
-    }
-    
-    private function setSecretKey($secretKey)
-    {
-        $this->secretKey = $secretKey;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/application/cloud_storage/Amazon_S3.php b/airtime_mvc/application/cloud_storage/Amazon_S3.php
new file mode 100644
index 000000000..8a7c3b387
--- /dev/null
+++ b/airtime_mvc/application/cloud_storage/Amazon_S3.php
@@ -0,0 +1,72 @@
+<?php
+
+require_once 'StorageBackend.php';
+
+class Amazon_S3 extends StorageBackend
+{
+    private $zendServiceAmazonS3;
+    
+    public function Amazon_S3($securityCredentials)
+    {
+        $this->setBucket($securityCredentials['bucket']);
+        $this->setAccessKey($securityCredentials['api_key']);
+        $this->setSecretKey($securityCredentials['api_key_secret']);
+        
+        $this->zendServiceAmazonS3 = new Zend_Service_Amazon_S3(
+            $this->getAccessKey(),
+            $this->getSecretKey());
+    }
+    
+    public function getAbsoluteFilePath($resourceId)
+    {
+        $endpoint = $this->zendServiceAmazonS3->getEndpoint();
+        $scheme = $endpoint->getScheme();
+        $host = $endpoint->getHost();
+        $bucket = $this->getBucket();
+        return "$scheme://$bucket.$host/".utf8_encode($resourceId);
+    }
+
+    public function getSignedURL($resourceId)
+    {
+        //URL will be active for 30 minutes
+        $expires = time()+1800;
+        
+        $bucket = $this->getBucket();
+        $secretKey = $this->getSecretKey();
+        $accessKey = $this->getAccessKey();
+        
+        $string_to_sign = utf8_encode("GET\n\n\n$expires\n/$bucket/$resourceId");
+        // We need to urlencode the entire signature in case the hashed signature
+        // has spaces. (NOTE: utf8_encode() does not work here because it turns
+        // spaces into non-breaking spaces)
+        $signature = urlencode(base64_encode((hash_hmac("sha1", $string_to_sign, $secretKey, true))));
+        
+        $resourceURL = $this->getAbsoluteFilePath($resourceId);
+        return $resourceURL."?AWSAccessKeyId=$accessKey&Expires=$expires&Signature=$signature";
+    }
+    
+    public function getFileSize($resourceId)
+    {
+        $bucket = $this->getBucket();
+        
+        $amz_resource = utf8_encode("$bucket/$resourceId");
+        $amz_resource_info = $this->zendServiceAmazonS3->getInfo($amz_resource);
+        return $amz_resource_info["size"];
+    }
+    
+    public function deletePhysicalFile($resourceId)
+    {
+        $bucket = $this->getBucket();
+        $amz_resource = utf8_encode("$bucket/$resourceId");
+        
+        if ($this->zendServiceAmazonS3->isObjectAvailable($amz_resource)) {
+           // removeObject() returns true even if the object was not deleted (bug?)
+           // so that is not a good way to do error handling. isObjectAvailable()
+           // does however return the correct value; We have to assume that if the
+           // object is available the removeObject() function will work.
+           $this->zendServiceAmazonS3->removeObject($amz_resource);
+           } else {
+               throw new Exception("ERROR: Could not locate object on Amazon S3");
+           }
+    }
+}
diff --git a/airtime_mvc/application/cloud_storage/ProxyStorageBackend.php b/airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
new file mode 100644
index 000000000..78aeb1b35
--- /dev/null
+++ b/airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
@@ -0,0 +1,46 @@
+<?php
+
+require_once 'StorageBackend.php';
+require_once 'Amazon_S3.php';
+
+/**
+ * 
+ * Controls access to the storage backend class where a file is stored.
+ *
+ */
+class ProxyStorageBackend extends StorageBackend
+{
+    private $storageBackend;
+    
+    /**
+     * Receives the file's storage backend and instantiates the approriate
+     * object.
+     */
+    public function ProxyStorageBackend($storageBackend)
+    {
+        $CC_CONFIG = Config::getConfig();
+        
+        $this->storageBackend = new $storageBackend($CC_CONFIG[$storageBackend]);
+    }
+    
+    public function getAbsoluteFilePath($resourceId)
+    {
+        return $this->storageBackend->getAbsoluteFilePath($resourceId);
+    }
+    
+    public function getSignedURL($resourceId)
+    {
+        return $this->storageBackend->getSignedURL($resourceId);
+    }
+    
+    public function getFileSize($resourceId)
+    {
+        return $this->storageBackend->getFileSize($resourceId);
+    }
+    
+    public function deletePhysicalFile($resourceId)
+    {
+        $this->storageBackend->deletePhysicalFile($resourceId);
+    }
+
+}
diff --git a/airtime_mvc/application/cloud_storage/StorageBackend.php b/airtime_mvc/application/cloud_storage/StorageBackend.php
new file mode 100644
index 000000000..84a9a8d72
--- /dev/null
+++ b/airtime_mvc/application/cloud_storage/StorageBackend.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * 
+ * Provides access to file objects stored on a specific storage backend.
+ */
+abstract class StorageBackend
+{
+    private $bucket;
+    private $accessKey;
+    private $secretKey;
+    
+    /** Returns the file object's URL to the storage backend it is located on. */
+    abstract public function getAbsoluteFilePath($resourceId);
+    
+    /** Returns the file object's signed URL. The URL must be signed since they
+     *  privately stored on the storage backend. */
+    abstract public function getSignedURL($resourceId);
+    
+    /** Returns the file's size in bytes. */
+    abstract public function getFileSize($resourceId);
+    
+    /** Deletes the file from the storage backend. */
+    abstract public function deletePhysicalFile($resourceId);
+    
+    protected function getBucket()
+    {
+        return $this->bucket;
+    }
+    
+    protected function setBucket($bucket)
+    {
+        $this->bucket = $bucket;
+    }
+    
+    protected function getAccessKey()
+    {
+        return $this->accessKey;
+    }
+    
+    protected function setAccessKey($accessKey)
+    {
+        $this->accessKey = $accessKey;
+    }
+    
+    protected function getSecretKey()
+    {
+        return $this->secretKey;
+    }
+    
+    protected function setSecretKey($secretKey)
+    {
+        $this->secretKey = $secretKey;
+    }
+}
diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php
index fd66453dd..932834fe3 100644
--- a/airtime_mvc/application/configs/conf.php
+++ b/airtime_mvc/application/configs/conf.php
@@ -25,10 +25,14 @@ class Config {
             $filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf";
         }
         
-        // Parse separate conf file for Amazon S3 values
-        $amazonFilename = isset($_SERVER['AMAZONS3_CONF']) ? $_SERVER['AMAZONS3_CONF'] : "/etc/airtime-saas/amazon.conf";
-        $amazonValues = parse_ini_file($amazonFilename, true);
-        $CC_CONFIG['cloud_storage'] = $amazonValues['cloud_storage'];
+        // Parse separate conf file for cloud storage values
+        $cloudStorageConfig = isset($_SERVER['CLOUD_STORAGE_CONF']) ? $_SERVER['CLOUD_STORAGE_CONF'] : "/etc/airtime-saas/cloud_storage.conf";
+        $cloudStorageValues = parse_ini_file($cloudStorageConfig, true);
+        
+        $supportedStorageBackends = array('amazon_S3');
+        foreach ($supportedStorageBackends as $backend) {
+            $CC_CONFIG[$backend] = $cloudStorageValues[$backend];
+        }
         
         $values = parse_ini_file($filename, true);
 
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 621be784a..ec96ac8a7 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -78,6 +78,10 @@ class ApiController extends Zend_Controller_Action
      */
     public function getMediaAction()
     {
+        // Close the session so other HTTP requests can be completed while
+        // tracks are read for previewing or downloading.
+        session_write_close();
+
         $fileId = $this->_getParam("file");
 
         $media = Application_Model_StoredFile::RecallById($fileId);
@@ -168,10 +172,11 @@ class ApiController extends Zend_Controller_Action
         while (@ob_end_flush());
 
         // NOTE: We can't use fseek here because it does not work with streams
-        // (a.k.a. Files stored on Amazon S3)
+        // (a.k.a. Files stored in the cloud)
         while(!feof($fm) && (connection_status() == 0)) {
             echo fread($fm, 1024 * 8);
         }
+        fclose($fm);
     }
 
     //Used by the SaaS monitoring
diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php
index f5e7fb0c3..3b052ec4c 100644
--- a/airtime_mvc/application/models/RabbitMq.php
+++ b/airtime_mvc/application/models/RabbitMq.php
@@ -105,6 +105,11 @@ class Application_Model_RabbitMq
         $data['original_filename'] = $originalFilename;
         $data['callback_url'] = $callbackUrl;
         $data['api_key'] = $apiKey;
+        // Pass station name to the analyzer so we can set it with the file's metadata
+        // before uploading it to the cloud. This isn't a requirement for cloud storage,
+        // but put there as a safeguard, since all Airtime Pro stations will share the
+        // same bucket.
+        $data['station_domain'] = $stationDomain = Application_Model_Preference::GetStationName();
         
         $jsonData = json_encode($data);
         //self::sendMessage($exchange, 'topic', false, $jsonData, 'airtime-uploads');
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 996462336..edcbf7fd0 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -778,9 +778,11 @@ SQL;
      * @param Array $item schedule info about one track
      * @param Integer $media_id scheduled item's cc_files id
      * @param String $uri path to the scheduled item's physical location
-     * @param String $amazonS3ResourceId scheduled item's Amazon S3 resource id, if applicable
+     * @param String $downloadURL URL PYPO makes to the REST API to download the file for playout
+     * @param Integer $filsize The file's file size in bytes
+     * 
      */
-    private static function createFileScheduleEvent(&$data, $item, $media_id, $uri, $amazonS3ResourceId)
+    private static function createFileScheduleEvent(&$data, $item, $media_id, $uri, $downloadURL, $filesize)
     {
         $start = self::AirtimeTimeToPypoTime($item["start"]);
         $end   = self::AirtimeTimeToPypoTime($item["end"]);
@@ -814,11 +816,10 @@ SQL;
             'end'               => $end,
             'show_name'         => $item["show_name"],
             'replay_gain'       => $replay_gain,
-            'independent_event' => $independent_event
+            'independent_event' => $independent_event,
+            'download_url'      => $downloadURL,
+            'filesize'          => $filesize,
         );
-        if (!is_null($amazonS3ResourceId)) {
-            $schedule_item["amazonS3_resource_id"] = $amazonS3ResourceId;
-        }
 
         if ($schedule_item['cue_in'] > $schedule_item['cue_out']) {
             $schedule_item['cue_in'] = $schedule_item['cue_out'];
@@ -952,10 +953,14 @@ SQL;
                 $storedFile = Application_Model_StoredFile::RecallById($media_id);
                 $file = $storedFile->getPropelOrm();
                 $uri = $file->getAbsoluteFilePath();
-                $amazonS3ResourceId = $file->getResourceId();
                 
-                self::createFileScheduleEvent($data, $item, $media_id, $uri, $amazonS3ResourceId);
-            }
+                $baseUrl = Application_Common_OsPath::getBaseDir();
+                $downloadURL = "http://".$_SERVER['HTTP_HOST'].$baseUrl."rest/media/$media_id/download";
+                $filesize = $file->getFileSize();
+                
+                self::createFileScheduleEvent($data, $item, $media_id, $uri, $downloadURL, $filesize);
+            } 
+
             elseif (!is_null($item['stream_id'])) {
                 //row is type "webstream"
                 $media_id = $item['stream_id'];
diff --git a/airtime_mvc/application/models/airtime/CloudFile.php b/airtime_mvc/application/models/airtime/CloudFile.php
index c1d5b3b7a..cd2d22657 100644
--- a/airtime_mvc/application/models/airtime/CloudFile.php
+++ b/airtime_mvc/application/models/airtime/CloudFile.php
@@ -1,13 +1,13 @@
 <?php
 
-require_once 'Amazon_S3.php';
+require_once 'ProxyStorageBackend.php';
 
 /**
  * Skeleton subclass for representing a row from the 'cloud_file' table.
  *
  * Each cloud_file has a corresponding cc_file referenced as a foreign key.
  * The file's metadata is stored in the cc_file table. This, cloud_file,
- * table represents files that are stored on Amazon S3.
+ * table represents files that are stored in the cloud.
  *
  * You should add additional methods to this class to meet the
  * application requirements.  This class will only be generated as
@@ -17,6 +17,7 @@ require_once 'Amazon_S3.php';
  */
 class CloudFile extends BaseCloudFile
 {
+    private $proxyStorageBackend;
 
     /**
      * Returns a signed URL to the file's object on Amazon S3. Since we are
@@ -25,7 +26,10 @@ class CloudFile extends BaseCloudFile
      */
     public function getURLForTrackPreviewOrDownload()
     {
-        return $this->getAbsoluteFilePath()."?".$this->getAuthenticationParams();
+        if ($this->proxyStorageBackend == null) {
+            $this->proxyStorageBackend = new ProxyStorageBackend($this->getStorageBackend());
+        }
+        return $this->proxyStorageBackend->getSignedURL($this->getResourceId());
     }
     
     /**
@@ -34,39 +38,10 @@ class CloudFile extends BaseCloudFile
      */
     public function getAbsoluteFilePath()
     {
-        $amazon_s3 = new Amazon_S3();
-        $zend_s3 = $amazon_s3->getZendServiceAmazonS3();
-        $resource_id = $this->getResourceId();
-        $endpoint = $zend_s3->getEndpoint();
-        $scheme = $endpoint->getScheme();
-        $host = $endpoint->getHost();
-        $s3_bucket = $amazon_s3->getBucket();
-        return "$scheme://$s3_bucket.$host/".utf8_encode($resource_id);
-    }
-    
-    /**
-     * 
-     * Returns a string of authentication paramaters to append to the cloud
-     * object's URL. We need this for track preview and download because the
-     * objects are privately stored on Amazon S3.
-     */
-    public function getAuthenticationParams()
-    {
-        $expires = time()+120;
-        $resource_id = $this->getResourceId();
-
-        $amazon_s3 = new Amazon_S3();
-        $s3_bucket = $amazon_s3->getBucket();
-        $s3_secret_key = $amazon_s3->getSecretKey();
-        $s3_access_key = $amazon_s3->getAccessKey();
-        
-        $string_to_sign = utf8_encode("GET\n\n\n$expires\n/$s3_bucket/$resource_id");
-        // We need to urlencode the entire signature in case the hashed signature
-        // has spaces. (NOTE: utf8_encode() does not work here because it turns
-        // spaces into non-breaking spaces)
-        $signature = urlencode(base64_encode((hash_hmac("sha1", $string_to_sign, $s3_secret_key, true))));
-        
-        return "AWSAccessKeyId=$s3_access_key&Expires=$expires&Signature=$signature";
+        if ($this->proxyStorageBackend == null) {
+            $this->proxyStorageBackend = new ProxyStorageBackend($this->getStorageBackend());
+        }
+        return $this->proxyStorageBackend->getAbsoluteFilePath($this->getResourceId());
     }
     
     /**
@@ -74,15 +49,10 @@ class CloudFile extends BaseCloudFile
      */
     public function getFileSize()
     {
-        $amazon_s3 = new Amazon_S3();
-        
-        $zend_s3 = $amazon_s3->getZendServiceAmazonS3();
-        $bucket = $amazon_s3->getBucket();
-        $resource_id = $this->getResourceId();
-        
-        $amz_resource = utf8_encode("$bucket/$resource_id");
-        $amz_resource_info = $zend_s3->getInfo($amz_resource);
-        return $amz_resource_info["size"];
+        if ($this->proxyStorageBackend == null) {
+            $this->proxyStorageBackend = new ProxyStorageBackend($this->getStorageBackend());
+        }
+        return $this->proxyStorageBackend->getFileSize($this->getResourceId());
     }
     
     public function getFilename()
@@ -115,25 +85,14 @@ class CloudFile extends BaseCloudFile
     
     /**
      * 
-     * Deletes the file from Amazon S3
+     * Deletes the file from cloud storage
      */
     public function deletePhysicalFile()
     {
-        $amazon_s3 = new Amazon_S3();
-        $zend_s3 = $amazon_s3->getZendServiceAmazonS3();
-        $bucket = $amazon_s3->getBucket();
-        $resource_id = $this->getResourceId();
-        $amz_resource = utf8_encode("$bucket/$resource_id");
-        
-        if ($zend_s3->isObjectAvailable($amz_resource)) {
-            // removeObject() returns true even if the object was not deleted (bug?)
-            // so that is not a good way to do error handling. isObjectAvailable()
-            // does however return the correct value; We have to assume that if the
-            // object is available the removeObject() function will work.
-            $zend_s3->removeObject($amz_resource);
-        } else {
-            throw new Exception("ERROR: Could not locate object on Amazon S3");
+        if ($this->proxyStorageBackend == null) {
+            $this->proxyStorageBackend = new ProxyStorageBackend($this->getStorageBackend());
         }
+        $this->proxyStorageBackend->deletePhysicalFile($this->getResourceId());
     }
     
     /**
diff --git a/airtime_mvc/application/models/airtime/map/CloudFileTableMap.php b/airtime_mvc/application/models/airtime/map/CloudFileTableMap.php
index 898fc0b79..5f9702bf2 100644
--- a/airtime_mvc/application/models/airtime/map/CloudFileTableMap.php
+++ b/airtime_mvc/application/models/airtime/map/CloudFileTableMap.php
@@ -40,6 +40,7 @@ class CloudFileTableMap extends TableMap
         $this->setPrimaryKeyMethodInfo('cloud_file_id_seq');
         // columns
         $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null);
+        $this->addColumn('storage_backend', 'StorageBackend', 'VARCHAR', true, 512, null);
         $this->addColumn('resource_id', 'ResourceId', 'LONGVARCHAR', true, null, null);
         $this->addForeignKey('cc_file_id', 'CcFileId', 'INTEGER', 'cc_files', 'id', false, null, null);
         // validators
diff --git a/airtime_mvc/application/models/airtime/om/BaseCloudFile.php b/airtime_mvc/application/models/airtime/om/BaseCloudFile.php
index f9b2e0727..988fadeb9 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCloudFile.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCloudFile.php
@@ -35,6 +35,12 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
      */
     protected $id;
 
+    /**
+     * The value for the storage_backend field.
+     * @var        string
+     */
+    protected $storage_backend;
+
     /**
      * The value for the resource_id field.
      * @var        string
@@ -83,6 +89,17 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         return $this->id;
     }
 
+    /**
+     * Get the [storage_backend] column value.
+     *
+     * @return string
+     */
+    public function getStorageBackend()
+    {
+
+        return $this->storage_backend;
+    }
+
     /**
      * Get the [resource_id] column value.
      *
@@ -126,6 +143,27 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         return $this;
     } // setDbId()
 
+    /**
+     * Set the value of [storage_backend] column.
+     *
+     * @param  string $v new value
+     * @return CloudFile The current object (for fluent API support)
+     */
+    public function setStorageBackend($v)
+    {
+        if ($v !== null && is_numeric($v)) {
+            $v = (string) $v;
+        }
+
+        if ($this->storage_backend !== $v) {
+            $this->storage_backend = $v;
+            $this->modifiedColumns[] = CloudFilePeer::STORAGE_BACKEND;
+        }
+
+
+        return $this;
+    } // setStorageBackend()
+
     /**
      * Set the value of [resource_id] column.
      *
@@ -205,8 +243,9 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         try {
 
             $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null;
-            $this->resource_id = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null;
-            $this->cc_file_id = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null;
+            $this->storage_backend = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null;
+            $this->resource_id = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null;
+            $this->cc_file_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null;
             $this->resetModified();
 
             $this->setNew(false);
@@ -216,7 +255,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
             }
             $this->postHydrate($row, $startcol, $rehydrate);
 
-            return $startcol + 3; // 3 = CloudFilePeer::NUM_HYDRATE_COLUMNS.
+            return $startcol + 4; // 4 = CloudFilePeer::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException("Error populating CloudFile object", $e);
@@ -457,6 +496,9 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         if ($this->isColumnModified(CloudFilePeer::ID)) {
             $modifiedColumns[':p' . $index++]  = '"id"';
         }
+        if ($this->isColumnModified(CloudFilePeer::STORAGE_BACKEND)) {
+            $modifiedColumns[':p' . $index++]  = '"storage_backend"';
+        }
         if ($this->isColumnModified(CloudFilePeer::RESOURCE_ID)) {
             $modifiedColumns[':p' . $index++]  = '"resource_id"';
         }
@@ -477,6 +519,9 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
                     case '"id"':
                         $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
                         break;
+                    case '"storage_backend"':
+                        $stmt->bindValue($identifier, $this->storage_backend, PDO::PARAM_STR);
+                        break;
                     case '"resource_id"':
                         $stmt->bindValue($identifier, $this->resource_id, PDO::PARAM_STR);
                         break;
@@ -626,9 +671,12 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
                 return $this->getDbId();
                 break;
             case 1:
-                return $this->getResourceId();
+                return $this->getStorageBackend();
                 break;
             case 2:
+                return $this->getResourceId();
+                break;
+            case 3:
                 return $this->getCcFileId();
                 break;
             default:
@@ -661,8 +709,9 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         $keys = CloudFilePeer::getFieldNames($keyType);
         $result = array(
             $keys[0] => $this->getDbId(),
-            $keys[1] => $this->getResourceId(),
-            $keys[2] => $this->getCcFileId(),
+            $keys[1] => $this->getStorageBackend(),
+            $keys[2] => $this->getResourceId(),
+            $keys[3] => $this->getCcFileId(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -711,9 +760,12 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
                 $this->setDbId($value);
                 break;
             case 1:
-                $this->setResourceId($value);
+                $this->setStorageBackend($value);
                 break;
             case 2:
+                $this->setResourceId($value);
+                break;
+            case 3:
                 $this->setCcFileId($value);
                 break;
         } // switch()
@@ -741,8 +793,9 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         $keys = CloudFilePeer::getFieldNames($keyType);
 
         if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]);
-        if (array_key_exists($keys[1], $arr)) $this->setResourceId($arr[$keys[1]]);
-        if (array_key_exists($keys[2], $arr)) $this->setCcFileId($arr[$keys[2]]);
+        if (array_key_exists($keys[1], $arr)) $this->setStorageBackend($arr[$keys[1]]);
+        if (array_key_exists($keys[2], $arr)) $this->setResourceId($arr[$keys[2]]);
+        if (array_key_exists($keys[3], $arr)) $this->setCcFileId($arr[$keys[3]]);
     }
 
     /**
@@ -755,6 +808,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
         $criteria = new Criteria(CloudFilePeer::DATABASE_NAME);
 
         if ($this->isColumnModified(CloudFilePeer::ID)) $criteria->add(CloudFilePeer::ID, $this->id);
+        if ($this->isColumnModified(CloudFilePeer::STORAGE_BACKEND)) $criteria->add(CloudFilePeer::STORAGE_BACKEND, $this->storage_backend);
         if ($this->isColumnModified(CloudFilePeer::RESOURCE_ID)) $criteria->add(CloudFilePeer::RESOURCE_ID, $this->resource_id);
         if ($this->isColumnModified(CloudFilePeer::CC_FILE_ID)) $criteria->add(CloudFilePeer::CC_FILE_ID, $this->cc_file_id);
 
@@ -820,6 +874,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
      */
     public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
     {
+        $copyObj->setStorageBackend($this->getStorageBackend());
         $copyObj->setResourceId($this->getResourceId());
         $copyObj->setCcFileId($this->getCcFileId());
 
@@ -938,6 +993,7 @@ abstract class BaseCloudFile extends BaseObject implements Persistent
     public function clear()
     {
         $this->id = null;
+        $this->storage_backend = null;
         $this->resource_id = null;
         $this->cc_file_id = null;
         $this->alreadyInSave = false;
diff --git a/airtime_mvc/application/models/airtime/om/BaseCloudFilePeer.php b/airtime_mvc/application/models/airtime/om/BaseCloudFilePeer.php
index 93a0f4d7b..4a1b641c1 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCloudFilePeer.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCloudFilePeer.php
@@ -24,17 +24,20 @@ abstract class BaseCloudFilePeer
     const TM_CLASS = 'CloudFileTableMap';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 3;
+    const NUM_COLUMNS = 4;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
 
     /** The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */
-    const NUM_HYDRATE_COLUMNS = 3;
+    const NUM_HYDRATE_COLUMNS = 4;
 
     /** the column name for the id field */
     const ID = 'cloud_file.id';
 
+    /** the column name for the storage_backend field */
+    const STORAGE_BACKEND = 'cloud_file.storage_backend';
+
     /** the column name for the resource_id field */
     const RESOURCE_ID = 'cloud_file.resource_id';
 
@@ -60,12 +63,12 @@ abstract class BaseCloudFilePeer
      * e.g. CloudFilePeer::$fieldNames[CloudFilePeer::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('DbId', 'ResourceId', 'CcFileId', ),
-        BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'resourceId', 'ccFileId', ),
-        BasePeer::TYPE_COLNAME => array (CloudFilePeer::ID, CloudFilePeer::RESOURCE_ID, CloudFilePeer::CC_FILE_ID, ),
-        BasePeer::TYPE_RAW_COLNAME => array ('ID', 'RESOURCE_ID', 'CC_FILE_ID', ),
-        BasePeer::TYPE_FIELDNAME => array ('id', 'resource_id', 'cc_file_id', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, )
+        BasePeer::TYPE_PHPNAME => array ('DbId', 'StorageBackend', 'ResourceId', 'CcFileId', ),
+        BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'storageBackend', 'resourceId', 'ccFileId', ),
+        BasePeer::TYPE_COLNAME => array (CloudFilePeer::ID, CloudFilePeer::STORAGE_BACKEND, CloudFilePeer::RESOURCE_ID, CloudFilePeer::CC_FILE_ID, ),
+        BasePeer::TYPE_RAW_COLNAME => array ('ID', 'STORAGE_BACKEND', 'RESOURCE_ID', 'CC_FILE_ID', ),
+        BasePeer::TYPE_FIELDNAME => array ('id', 'storage_backend', 'resource_id', 'cc_file_id', ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
     );
 
     /**
@@ -75,12 +78,12 @@ abstract class BaseCloudFilePeer
      * e.g. CloudFilePeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'ResourceId' => 1, 'CcFileId' => 2, ),
-        BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'resourceId' => 1, 'ccFileId' => 2, ),
-        BasePeer::TYPE_COLNAME => array (CloudFilePeer::ID => 0, CloudFilePeer::RESOURCE_ID => 1, CloudFilePeer::CC_FILE_ID => 2, ),
-        BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'RESOURCE_ID' => 1, 'CC_FILE_ID' => 2, ),
-        BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'resource_id' => 1, 'cc_file_id' => 2, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, )
+        BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'StorageBackend' => 1, 'ResourceId' => 2, 'CcFileId' => 3, ),
+        BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'storageBackend' => 1, 'resourceId' => 2, 'ccFileId' => 3, ),
+        BasePeer::TYPE_COLNAME => array (CloudFilePeer::ID => 0, CloudFilePeer::STORAGE_BACKEND => 1, CloudFilePeer::RESOURCE_ID => 2, CloudFilePeer::CC_FILE_ID => 3, ),
+        BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'STORAGE_BACKEND' => 1, 'RESOURCE_ID' => 2, 'CC_FILE_ID' => 3, ),
+        BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'storage_backend' => 1, 'resource_id' => 2, 'cc_file_id' => 3, ),
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, )
     );
 
     /**
@@ -155,10 +158,12 @@ abstract class BaseCloudFilePeer
     {
         if (null === $alias) {
             $criteria->addSelectColumn(CloudFilePeer::ID);
+            $criteria->addSelectColumn(CloudFilePeer::STORAGE_BACKEND);
             $criteria->addSelectColumn(CloudFilePeer::RESOURCE_ID);
             $criteria->addSelectColumn(CloudFilePeer::CC_FILE_ID);
         } else {
             $criteria->addSelectColumn($alias . '.id');
+            $criteria->addSelectColumn($alias . '.storage_backend');
             $criteria->addSelectColumn($alias . '.resource_id');
             $criteria->addSelectColumn($alias . '.cc_file_id');
         }
diff --git a/airtime_mvc/application/models/airtime/om/BaseCloudFileQuery.php b/airtime_mvc/application/models/airtime/om/BaseCloudFileQuery.php
index d09041387..e57ff2797 100644
--- a/airtime_mvc/application/models/airtime/om/BaseCloudFileQuery.php
+++ b/airtime_mvc/application/models/airtime/om/BaseCloudFileQuery.php
@@ -7,10 +7,12 @@
  *
  *
  * @method CloudFileQuery orderByDbId($order = Criteria::ASC) Order by the id column
+ * @method CloudFileQuery orderByStorageBackend($order = Criteria::ASC) Order by the storage_backend column
  * @method CloudFileQuery orderByResourceId($order = Criteria::ASC) Order by the resource_id column
  * @method CloudFileQuery orderByCcFileId($order = Criteria::ASC) Order by the cc_file_id column
  *
  * @method CloudFileQuery groupByDbId() Group by the id column
+ * @method CloudFileQuery groupByStorageBackend() Group by the storage_backend column
  * @method CloudFileQuery groupByResourceId() Group by the resource_id column
  * @method CloudFileQuery groupByCcFileId() Group by the cc_file_id column
  *
@@ -25,10 +27,12 @@
  * @method CloudFile findOne(PropelPDO $con = null) Return the first CloudFile matching the query
  * @method CloudFile findOneOrCreate(PropelPDO $con = null) Return the first CloudFile matching the query, or a new CloudFile object populated from the query conditions when no match is found
  *
+ * @method CloudFile findOneByStorageBackend(string $storage_backend) Return the first CloudFile filtered by the storage_backend column
  * @method CloudFile findOneByResourceId(string $resource_id) Return the first CloudFile filtered by the resource_id column
  * @method CloudFile findOneByCcFileId(int $cc_file_id) Return the first CloudFile filtered by the cc_file_id column
  *
  * @method array findByDbId(int $id) Return CloudFile objects filtered by the id column
+ * @method array findByStorageBackend(string $storage_backend) Return CloudFile objects filtered by the storage_backend column
  * @method array findByResourceId(string $resource_id) Return CloudFile objects filtered by the resource_id column
  * @method array findByCcFileId(int $cc_file_id) Return CloudFile objects filtered by the cc_file_id column
  *
@@ -138,7 +142,7 @@ abstract class BaseCloudFileQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
-        $sql = 'SELECT "id", "resource_id", "cc_file_id" FROM "cloud_file" WHERE "id" = :p0';
+        $sql = 'SELECT "id", "storage_backend", "resource_id", "cc_file_id" FROM "cloud_file" WHERE "id" = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -269,6 +273,35 @@ abstract class BaseCloudFileQuery extends ModelCriteria
         return $this->addUsingAlias(CloudFilePeer::ID, $dbId, $comparison);
     }
 
+    /**
+     * Filter the query on the storage_backend column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByStorageBackend('fooValue');   // WHERE storage_backend = 'fooValue'
+     * $query->filterByStorageBackend('%fooValue%'); // WHERE storage_backend LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $storageBackend The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return CloudFileQuery The current query, for fluid interface
+     */
+    public function filterByStorageBackend($storageBackend = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($storageBackend)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $storageBackend)) {
+                $storageBackend = str_replace('*', '%', $storageBackend);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(CloudFilePeer::STORAGE_BACKEND, $storageBackend, $comparison);
+    }
+
     /**
      * Filter the query on the resource_id column
      *
diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php
index d0f2a3d87..1d8cb1a11 100644
--- a/airtime_mvc/application/modules/rest/controllers/MediaController.php
+++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php
@@ -73,9 +73,10 @@ class Rest_MediaController extends Zend_Rest_Controller
             $storedFile = new Application_Model_StoredFile($file, $con);
             $baseUrl = Application_Common_OsPath::getBaseDir();
 
+            $CC_CONFIG = Config::getConfig();
             $this->getResponse()
                 ->setHttpResponseCode(200)
-                ->appendBody($this->_redirect($storedFile->getRelativeFileUrl($baseUrl).'/download/true'));
+                ->appendBody($this->_redirect($storedFile->getRelativeFileUrl($baseUrl).'/download/true/api_key/'.$CC_CONFIG["apiKey"][0]));
         } else {
             $this->fileNotFoundResponse();
         }
@@ -192,6 +193,9 @@ class Rest_MediaController extends Zend_Rest_Controller
         
         $file = CcFilesQuery::create()->findPk($id);
 
+        // Since we check for this value when deleting files, set it first
+        //$file->setDbDirectory(self::MUSIC_DIRS_STOR_PK);
+
         $requestData = json_decode($this->getRequest()->getRawBody(), true);
         $whiteList = $this->removeBlacklistedFieldsFromRequestData($requestData);
         $whiteList = $this->stripTimeStampFromYearTag($whiteList);
@@ -213,6 +217,7 @@ class Rest_MediaController extends Zend_Rest_Controller
                 return;
             }
             $cloudFile = new CloudFile();
+            $cloudFile->setStorageBackend($requestData["storage_backend"]);
             $cloudFile->setResourceId($requestData["resource_id"]);
             $cloudFile->setCcFiles($file);
             $cloudFile->save();
@@ -316,7 +321,6 @@ class Rest_MediaController extends Zend_Rest_Controller
         $authHeader = $this->getRequest()->getHeader("Authorization");
         $encodedRequestApiKey = substr($authHeader, strlen("Basic "));
         $encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":");
-        
         if ($encodedRequestApiKey === $encodedStoredApiKey) 
         {
             return true;
diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml
index 1a4dce61d..543ff4d58 100644
--- a/airtime_mvc/build/schema.xml
+++ b/airtime_mvc/build/schema.xml
@@ -101,6 +101,7 @@
   <!-- Class Table Inheritance -->
   <table name="cloud_file" phpName="CloudFile">
     <column name="id" phpName="DbId" required="true" primaryKey="true" autoIncrement="true" type="INTEGER"/>
+    <column name="storage_backend" phpName="StorageBackend" type="VARCHAR" size="512" required="true" />
     <column name="resource_id" phpName="ResourceId" type="LONGVARCHAR" required="true"/>
     <column name="cc_file_id" type="INTEGER"/>
     <foreign-key foreignTable="cc_files" onDelete="CASCADE">
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql
index e8c5c7c22..80f139d25 100644
--- a/airtime_mvc/build/sql/schema.sql
+++ b/airtime_mvc/build/sql/schema.sql
@@ -110,6 +110,7 @@ DROP TABLE IF EXISTS "cloud_file" CASCADE;
 CREATE TABLE "cloud_file"
 (
     "id" serial NOT NULL,
+    "storage_backend" VARCHAR(512) NOT NULL,
     "resource_id" TEXT NOT NULL,
     "cc_file_id" INTEGER,
     PRIMARY KEY ("id")
@@ -615,9 +616,6 @@ CREATE TABLE "cc_listener_count"
     PRIMARY KEY ("id")
 );
 
-<<<<<<< HEAD
------------------------------------------------------------------------
--- cc_locale
 -----------------------------------------------------------------------
 
 DROP TABLE IF EXISTS "cc_locale" CASCADE;
@@ -631,13 +629,13 @@ CREATE TABLE "cc_locale"
 );
 
 -----------------------------------------------------------------------
-=======
+
 COMMENT ON TABLE "cc_listener_count" IS '';
 
 
 SET search_path TO public;
 -----------------------------------------------------------------------------
->>>>>>> saas
+
 -- cc_playout_history
 -----------------------------------------------------------------------
 
diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
index 1e45a37fb..9c10fc7cc 100644
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
@@ -100,6 +100,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -180,6 +181,7 @@ msgstr "Heslo"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Žánr"
 
@@ -320,6 +322,8 @@ msgstr "Internetová stránka:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Jazyk:"
 
@@ -342,6 +346,10 @@ msgstr "Jazyk:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Uložit"
 
@@ -359,6 +367,9 @@ msgstr "Zrušit"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Uživatelské jméno:"
 
@@ -366,22 +377,31 @@ msgstr "Uživatelské jméno:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Heslo:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Ověřit heslo:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Jméno:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Příjmení:"
 
@@ -390,55 +410,70 @@ msgstr "Příjmení:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobilní telefon:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Typ uživatele:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Host"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Program manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Administrátor"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Přihlašovací jméno není jedinečné."
 
@@ -531,10 +566,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Přihlásit"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Opište znaky, které vidíte na obrázku níže."
 
@@ -885,6 +922,7 @@ msgstr "Vyberte kritéria"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -906,6 +944,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Skladatel"
 
@@ -914,6 +954,7 @@ msgstr "Skladatel"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Dirigent"
 
@@ -923,6 +964,8 @@ msgstr "Dirigent"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Autorská práva"
 
@@ -934,6 +977,9 @@ msgstr "Autorská práva"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Tvůrce"
 
@@ -949,6 +995,7 @@ msgstr "Zakódováno"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -957,6 +1004,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Označení "
 
@@ -965,6 +1013,7 @@ msgstr "Označení "
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Jazyk"
 
@@ -989,6 +1038,8 @@ msgstr "Naposledy vysíláno"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Délka"
 
@@ -1004,6 +1055,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Nálada"
 
@@ -1034,6 +1086,9 @@ msgstr "Vzorkovací frekvence (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Název"
 
@@ -1063,6 +1118,7 @@ msgstr "Internetové stránky"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Rok "
 
@@ -1326,6 +1382,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Musíte souhlasit se zásadami ochrany osobních údajů."
 
@@ -1336,11 +1394,13 @@ msgstr "Hodnota je požadována a nemůže zůstat prázdná"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Čas začátku"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Čas konce"
 
@@ -1517,6 +1577,12 @@ msgstr "Nelze mít dobu trvání delší než 24 hodin"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Nelze nastavit překrývající se vysílání."
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons nekomerční Zachovejte licenci"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Časové pásmo uživatelského rozhraní"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "E-mailová adresa"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Neplatná forma hodnot."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Prosím, zadejte své uživatelské jméno a heslo"
 
@@ -1757,6 +1826,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1766,6 +1836,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Zadaný e-mail nebyl nalezen."
 
@@ -1784,16 +1855,19 @@ msgstr "Stáhnout"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Uživatel byl úspěšně přidán!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Uživatel byl úspěšně aktualizován!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Nastavení úspěšně aktualizováno!"
 
@@ -1964,6 +2038,7 @@ msgstr "Nahrávání ..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Vše"
 
@@ -2740,6 +2815,8 @@ msgstr "Otevřít knihovnu pro přidání nebo odebrání obsahu"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Přidat / Odebrat obsah"
 
@@ -3168,6 +3245,7 @@ msgstr "Neznámý Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Nemáte udělen přístup k tomuto zdroji."
 
@@ -3182,6 +3260,10 @@ msgstr "Nemáte udělen přístup k tomuto zdroji."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Nemáte udělen přístup k tomuto zdroji. "
 
@@ -3197,11 +3279,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Špatný požadavek. Žádný 'mode' parametr neprošel."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Špatný požadavek. 'Mode' parametr je neplatný."
 
@@ -3240,6 +3326,9 @@ msgstr "Přidat do chytrého bloku"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Smazat"
 
@@ -3253,6 +3342,7 @@ msgstr "Duplikátní Playlist"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Upravit"
 
@@ -3333,16 +3423,19 @@ msgstr "Technická podpora"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Nastavení streamu aktualizováno."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "cesta by měla být specifikována"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problém s Liquidsoap ..."
 
@@ -3521,6 +3614,8 @@ msgstr "URL připojení Show Source:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Požadováno)"
 
@@ -3548,26 +3643,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(pouze pro ověřovací účely, nebude zveřejněno)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Poznámka: Cokoli většího než 600x600 bude zmenšeno."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Zobrazit co posílám "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Pravidla a podmínky"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Obnovit heslo"
 
@@ -3596,6 +3701,7 @@ msgid "Remove watched directory"
 msgstr "Odebrat sledovaný adresář"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Nesledujete žádné mediální soubory."
 
@@ -3773,14 +3879,17 @@ msgid "Stream Settings"
 msgstr "Nastavení Streamu"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Globální nastavení"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Nastavení výstupního streamu"
 
@@ -3898,14 +4007,17 @@ msgid "Limit to "
 msgstr "Omezit na "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3963,6 +4075,7 @@ msgid "Then you're good to go!"
 msgstr "Pak můžete začít!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Pro podrobnější nápovědu si přečtěte %suživatelský manuál%s."
@@ -4265,6 +4378,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Znovu odvysílat %s od %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Vyberte zemi"
 
@@ -4373,6 +4488,8 @@ msgstr "Program který si prohlížíte je zastaralý!"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Program který si prohlížíte je zastaralý! "
 
@@ -4409,6 +4526,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Vybraný soubor neexistuje!"
 
@@ -4475,71 +4594,94 @@ msgstr "Zobrazit nahraný soubor metadat"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Zobrazit obsah"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Odstranit celý obsah"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Zrušit aktuální vysílání"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Upravit "
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Upravit vysílání"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Odstranit tuto instanci"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Odstranit tuto instanci a všechny následující"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Přístup odepřen"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Nelze přetáhnout opakujícící se vysílání"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Nelze přesunout vysílání z minulosti"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Nelze přesunout vysílání do minulosti"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Nelze přesunout nahrané vysílání méně než 1 hodinu před tím, než bude znovu "
 "vysíláno."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Vysílání bylo vymazáno, protože nahrané vysílání neexistuje!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Musíte počkat 1 hodinu před dalším vysíláním."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Stopa"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Přehráno"
 
@@ -4567,12 +4709,14 @@ msgid "No Records"
 msgstr "Žádné záznamy"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 "(Za účelem podpory vaší stanice musí být povolena funkce 'Zaslat Váš názor')."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Zásady ochrany osobních údajů Sourcefabric "
 
@@ -4668,117 +4812,149 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Propagovat mou stanici na Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Propagovat mou stanici na Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Zaškrtnutím tohoto políčka potvrzuji, že souhlasím s podmínkami "
-#~ "Sourcefabric %sv oblasti ochrany osobních údajů%s ."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Zaškrtnutím tohoto políčka potvrzuji, že souhlasím s podmínkami Sourcefabric "
+"%sv oblasti ochrany osobních údajů%s ."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Použít Airtime ověření:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Použít Airtime ověření:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Soubor v Airtime neexistuje."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Soubor v Airtime neexistuje."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Soubor v Airtime neexistuje."
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Soubor v Airtime neexistuje."
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Soubor v Airtime neexistuje."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Soubor v Airtime neexistuje."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime verze"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime verze"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Pomozte vylepšit Airtime tím, že nám dáte vědět, jak ho používáte. Tyto "
-#~ "informace se budou shromažďovat pravidelně tak aby se zvýšil Váš "
-#~ "uživatelský zážitek.%sKlikněte na 'Ano, pomoci Airtime', a my vás "
-#~ "ujišťujeme, že funkce, které používáte, budou neustále zlepšovány."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Pomozte vylepšit Airtime tím, že nám dáte vědět, jak ho používáte. Tyto "
+"informace se budou shromažďovat pravidelně tak aby se zvýšil Váš uživatelský "
+"zážitek.%sKlikněte na 'Ano, pomoci Airtime', a my vás ujišťujeme, že funkce, "
+"které používáte, budou neustále zlepšovány."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Klikněte na políčko níže pro inzerci váší stanice na %sSourcefabric.org"
-#~ "%s. Pro podpoření vaší stanice musí být povolena funkce 'Zaslat váš "
-#~ "názor'. Tyto údaje budou navíc shromažďovány na podporu zpětné vazby."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Klikněte na políčko níže pro inzerci váší stanice na %sSourcefabric.org%s. "
+"Pro podpoření vaší stanice musí být povolena funkce 'Zaslat váš názor'. Tyto "
+"údaje budou navíc shromažďovány na podporu zpětné vazby."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Znovu skenovat sledovaný adresář (Tato funkce je užitečná pokud se síť "
-#~ "rozrůstá a nemusí být včas synchronizována s Airitme)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Znovu skenovat sledovaný adresář (Tato funkce je užitečná pokud se síť "
+"rozrůstá a nemusí být včas synchronizována s Airitme)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Vítejte v Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Vítejte v Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Zde je návod, jak můžete začít používat Airtime pro automatizaci svého "
-#~ "vysílání: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Zde je návod, jak můžete začít používat Airtime pro automatizaci svého "
+"vysílání: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%s Airtime %s %s ,, open radio software pro plánování a řízení vzdálené "
-#~ "stanice. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%s Airtime %s %s ,, open radio software pro plánování a řízení vzdálené "
+"stanice. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime obnovení hesla"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime obnovení hesla"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy; Sourcefabric o.p.s. Všechna práva vyhrazena."
-#~ "%sSpravován a distribuován pod licencí GNU GPL v.3 od %sSourcefabric o.p."
-#~ "s.%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy; Sourcefabric o.p.s. Všechna práva vyhrazena."
+"%sSpravován a distribuován pod licencí GNU GPL v.3 od %sSourcefabric o.p.s.%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Pomozte Airtime vylepšit tím, že dáte Sourcefabric vědět, jak jej "
-#~ "používáte. Tyto informace budeme pravidelně shromažďovat, abychom "
-#~ "zlepšili váše uživatelské zkušenosti.%sKlikněte na odkaz 'Zaslat Váš "
-#~ "názor' a my zajistíme, že se budou funkce, které používáte, neustále "
-#~ "zlepšovat."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Pomozte Airtime vylepšit tím, že dáte Sourcefabric vědět, jak jej používáte. "
+"Tyto informace budeme pravidelně shromažďovat, abychom zlepšili váše "
+"uživatelské zkušenosti.%sKlikněte na odkaz 'Zaslat Váš názor' a my "
+"zajistíme, že se budou funkce, které používáte, neustále zlepšovat."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Klikněte na políčko níže pro podporu své stanice na %s Sourcefabric.org "
-#~ "%s ."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Klikněte na políčko níže pro podporu své stanice na %s Sourcefabric.org %s ."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%s Sourcefabric %s o.p.s. Airtime je distribuován podle %s GNU GPL v.3 %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%s Sourcefabric %s o.p.s. Airtime je distribuován podle %s GNU GPL v.3 %s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Vítejte v on-line demo verzi Airtime! Můžete se přihlásit pomocí "
-#~ "uživatelského jména 'admin' a hesla 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Vítejte v on-line demo verzi Airtime! Můžete se přihlásit pomocí "
+"uživatelského jména 'admin' a hesla 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Kupte si svůj Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Kupte si svůj Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Nelze změnit velikost již odvysílaného pořadu."
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Nelze změnit velikost již odvysílaného pořadu."
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Jednotlivá vysílání by se neměla překrývat"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Jednotlivá vysílání by se neměla překrývat"
diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
index 0ec430b1a..ca913680f 100644
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
@@ -321,6 +321,8 @@ msgstr "Webseite:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Sprache:"
 
@@ -343,6 +345,10 @@ msgstr "Sprache:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Speichern"
 
@@ -360,6 +366,9 @@ msgstr "Abbrechen"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -367,22 +376,31 @@ msgstr "Benutzername:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Passwort:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Passwort bestätigen:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Vorname:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Nachname:"
 
@@ -391,55 +409,70 @@ msgstr "Nachname:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-Mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobiltelefon:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Benutzertyp:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Gast"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Programm Manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Benutzername ist nicht einmalig."
 
@@ -533,10 +566,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Anmeldung"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr ""
 "Geben sie die Zeichen ein, die im darunter liegenden Bild zu sehen sind."
@@ -1329,6 +1364,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Sie müssen die Datenschutzrichtlinien akzeptieren."
 
@@ -1525,6 +1562,7 @@ msgstr "Die Dauer einer Sendung kann nicht länger als 24h sein"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
 msgid "Cannot schedule overlapping shows"
 msgstr "Sendungen können nicht überlappend geplant werden."
 
@@ -1699,6 +1737,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Zuordnung Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Zeitzone Interface"
 
@@ -1754,6 +1793,7 @@ msgstr "Ungültiger Eingabewert"
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Bitte geben sie Benutzername und Passwort ein"
 
@@ -1766,6 +1806,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1775,6 +1816,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Vorgegebene E-Mail-Adresse konnte nicht gefunden werden."
 
@@ -1793,16 +1835,19 @@ msgstr "Herunterladen"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Benutzer erfolgreich hinzugefügt!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Benutzer erfolgreich aktualisiert!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Einstellungen erfolgreich aktualisiert!"
 
@@ -1974,6 +2019,7 @@ msgstr "wird geladen..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Alle"
 
@@ -2770,6 +2816,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Inhalt hinzufügen / entfernen"
 
@@ -3203,6 +3251,7 @@ msgstr "Unbenannte Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr ""
 "Sie haben nicht die erforderliche Berechtigung sich mit dieser Quelle zu "
@@ -3219,6 +3268,8 @@ msgstr ""
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
 msgid "You are not allowed to access this resource. "
 msgstr ""
 "Sie haben nicht die erforderliche Berechtigung sich mit dieser Quelle zu "
@@ -3236,11 +3287,13 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Fehlerhafte Anfrage. Kein passender 'Mode'-Parameter."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Fehlerhafte Anfrage. 'Mode'-Parameter ist ungültig."
 
@@ -3279,6 +3332,9 @@ msgstr "Hinzufügen zu Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Löschen"
 
@@ -3292,6 +3348,7 @@ msgstr "Playlist duplizieren"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -3374,16 +3431,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Stream-Einstellungen aktualisiert."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "Pfad muß angegeben werden"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem mit Liquidsoap..."
 
@@ -3562,6 +3622,8 @@ msgstr "Show-Quelle Verbindungs-URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Erforderlich)"
 
@@ -3589,27 +3651,37 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(Ausschließlich zu Kontrollzwecken, wird nicht veröffentlicht)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr ""
 "Erinnerung: Sind Dateien größer als 600x600 Pixel, wird die Größe geändert."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Zeige mir was ich sende"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Geschäftsbedingungen und Rahmenverhältnisse"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -3638,6 +3710,7 @@ msgid "Remove watched directory"
 msgstr "Überwachten Ordner entfernen"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Sie überwachen keine Medienverzeichnisse."
 
@@ -3817,14 +3890,17 @@ msgid "Stream Settings"
 msgstr "Stream Einstellungen"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Globale Einstellungen"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Stream-Ausgabe Einstellungen"
 
@@ -3942,14 +4018,17 @@ msgid "Limit to "
 msgstr "Begrenzt auf "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -4009,6 +4088,7 @@ msgid "Then you're good to go!"
 msgstr "Dann kann es auch schon los gehen!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Für weitere Hilfe bitte das %sBenutzerhandbuch%s lesen."
@@ -4313,6 +4393,7 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Wiederholung von %s am %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
 msgid "Select Country"
 msgstr "Land wählen"
 
@@ -4426,6 +4507,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Der Kalender den sie sehen ist nicht mehr aktuell."
 
@@ -4464,6 +4547,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Eine der gewählten Dateien existiert nicht!"
 
@@ -4530,66 +4615,83 @@ msgstr "Metadaten der aufgezeichneten Datei ansehen"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Sendungsinhalt"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Gesamten Inhalt entfernen"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Aktuelle Sendung abbrechen"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Diese Folge bearbeiten"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Sendung bearbeiten"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Lösche diese Folge"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Lösche diese Folge und alle Nachfolgenden"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr ""
 "Wiederkehrende Sendungen können nicht per Drag'n'Drop verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr ""
 "Eine in der Vergangenheit liegende Sendung kann nicht verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
 msgid "Can't move show into past"
 msgstr "Eine Sendung kann nicht in die Vergangenheit verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Eine aufgezeichnete Sendung kann nicht verschoben werden, wenn der Zeitpunkt "
 "der Wiederholung weniger als eine Stunde bevor liegt."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
 msgid "Show was deleted because recorded show does not exist!"
 msgstr ""
 "Die Sendung wurde gelöscht, weil die aufgezeichnete Sendung nicht existiert."
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
 msgid "Must wait 1 hour to rebroadcast."
 msgstr ""
 "Das Wiederholen einer Sendung ist erst nach einer Stunde Wartezeit möglich."
@@ -4626,6 +4728,7 @@ msgid "No Records"
 msgstr "Keine Aufzeichnungen"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4633,6 +4736,7 @@ msgstr ""
 "aktiviert sein)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Datenschutzrichtlinie"
 
@@ -4731,115 +4835,142 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Meine Radio Station auf Sourcefabric.org bewerben"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Meine Radio Station auf Sourcefabric.org bewerben"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "Hiermit akzeptiere ich Sourcefabric's %sDatenschutzrichtlinien%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "Hiermit akzeptiere ich Sourcefabric's %sDatenschutzrichtlinien%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Airtime Authentifizierung:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Airtime Authentifizierung:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Datei existiert nicht in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+msgid "File does not exist in Airtime."
+msgstr "Datei existiert nicht in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Datei existiert nicht in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:578
+msgid "File does not exist in Airtime"
+msgstr "Datei existiert nicht in Airtime."
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Datei existiert nicht in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+msgid "File doesn't exist in Airtime."
+msgstr "Datei existiert nicht in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Version"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Version"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
-#~ "Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
-#~ "Benutzer zu fördern.%sDrücken Sie auf 'Ja, Airtime helfen' und wir "
-#~ "versichern, die von ihnen verwendeten Features laufend zu verbessern."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
+"Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
+"Benutzer zu fördern.%sDrücken Sie auf 'Ja, Airtime helfen' und wir "
+"versichern, die von ihnen verwendeten Features laufend zu verbessern."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation "
-#~ "auf %sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
-#~ "aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback "
-#~ "gesammelt."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation auf "
+"%sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
+"aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback gesammelt."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Überwachte Verzeichnisse nochmals durchsuchen\n"
-#~ "(Dies könnte nützlich sein, wenn Airtime beim Synchronisieren mit "
-#~ "Netzlaufwerken Schwierigkeiten hat)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Überwachte Verzeichnisse nochmals durchsuchen\n"
+"(Dies könnte nützlich sein, wenn Airtime beim Synchronisieren mit "
+"Netzlaufwerken Schwierigkeiten hat)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Willkommen bei Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Willkommen bei Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Starten sie hier, um die ersten Schritte für die Automation ihrer Radio "
-#~ "Station zu erfahren."
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Starten sie hier, um die ersten Schritte für die Automation ihrer Radio "
+"Station zu erfahren."
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, die offene Radio Software für Planung und Remote-Station-"
-#~ "Management. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, die offene Radio Software für Planung und Remote-Station-"
+"Management. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime Passwort Reset"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime Passwort Reset"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. Alle Rechte vorbehalten."
-#~ "%sGepflegt und vertrieben unter GNU GPL v.3 von %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. Alle Rechte vorbehalten."
+"%sGepflegt und vertrieben unter GNU GPL v.3 von %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
-#~ "Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
-#~ "Benutzer zu fördern.%sDrücken Sie auf 'Ja, Airtime helfen' und wir "
-#~ "versichern, die von ihnen verwendeten Features laufend zu verbessern."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
+"Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
+"Benutzer zu fördern.%sDrücken Sie auf 'Ja, Airtime helfen' und wir "
+"versichern, die von ihnen verwendeten Features laufend zu verbessern."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation "
-#~ "auf %sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
-#~ "aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback "
-#~ "gesammelt."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation auf "
+"%sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
+"aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback gesammelt."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime wird vertrieben unter %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime wird vertrieben unter %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Willkommen zur Online Artime Demo!\n"
-#~ "Sie können sich mit dem Benutzernamen 'admin' und dem Passwort 'admin' "
-#~ "anmelden."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Willkommen zur Online Artime Demo!\n"
+"Sie können sich mit dem Benutzernamen 'admin' und dem Passwort 'admin' "
+"anmelden."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Kaufen sie eine Kopie von Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Kaufen sie eine Kopie von Airtime"
 
 #~ msgid "can't resize a past show"
 #~ msgstr "Die Dauer einer vergangenen Sendung kann nicht verändert werden."
diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
index 50f230810..77cf7506b 100644
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
@@ -102,6 +102,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live Stream"
 
@@ -182,6 +183,7 @@ msgstr "Passwort"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genre"
 
@@ -322,6 +324,8 @@ msgstr "Webseite:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Sprache:"
 
@@ -344,6 +348,10 @@ msgstr "Sprache:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Speichern"
 
@@ -361,6 +369,9 @@ msgstr "Abbrechen"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Benutzername:"
 
@@ -368,22 +379,31 @@ msgstr "Benutzername:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Passwort:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Passwort bestätigen:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Vorname:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Nachname:"
 
@@ -392,55 +412,70 @@ msgstr "Nachname:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-Mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobiltelefon:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Benutzertyp:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Gast"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Programm Manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Benutzername ist bereits vorhanden."
 
@@ -534,10 +569,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Anmeldung"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Geben sie die Zeichen aus dem Bild unten ein."
 
@@ -888,6 +925,7 @@ msgstr " - Kriterien - "
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -909,6 +947,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Komponist"
 
@@ -917,6 +957,7 @@ msgstr "Komponist"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Dirigent"
 
@@ -926,6 +967,8 @@ msgstr "Dirigent"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -937,6 +980,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Interpret"
 
@@ -952,6 +998,7 @@ msgstr "Encoded By"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -960,6 +1007,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Label"
 
@@ -968,6 +1016,7 @@ msgstr "Label"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Sprache"
 
@@ -992,6 +1041,8 @@ msgstr "Zuletzt gespielt"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Länge"
 
@@ -1007,6 +1058,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Stimmung"
 
@@ -1037,6 +1089,9 @@ msgstr "Sample Rate (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Titel"
 
@@ -1066,6 +1121,7 @@ msgstr "Webseite"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Jahr"
 
@@ -1329,6 +1385,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Sie müssen die Datenschutzrichtlinien akzeptieren."
 
@@ -1339,11 +1397,13 @@ msgstr "Wert ist erforderlich und darf nicht leer sein"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Startzeit"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Endzeit"
 
@@ -1521,6 +1581,12 @@ msgstr "Die Dauer einer Sendung kann nicht länger als 24h sein"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Sendungen können nicht überlappend geplant werden."
 
@@ -1701,6 +1767,7 @@ msgstr ""
 "Weitergabe unter gleichen Bedingungen"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Interface Zeitzone:"
 
@@ -1735,6 +1802,7 @@ msgid "Email Address"
 msgstr "E-Mail Adresse"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1756,6 +1824,7 @@ msgstr "Ungültige Formularwerte."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Bitte geben sie Benutzernamen und Passwort ein"
 
@@ -1766,6 +1835,7 @@ msgstr "Falscher Benutzername oder Passwort. Bitte versuchen sie es erneut."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1776,6 +1846,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Angegebene E-Mail-Adresse konnte nicht gefunden."
 
@@ -1794,16 +1865,19 @@ msgstr "Download"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Benutzer erfolgreich hinzugefügt!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Benutzer erfolgreich aktualisiert!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Einstellungen erfolgreich aktualisiert!"
 
@@ -1975,6 +2049,7 @@ msgstr "wird geladen..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Alle"
 
@@ -2773,6 +2848,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Inhalt hinzufügen / entfernen"
 
@@ -3206,6 +3283,7 @@ msgstr "Unbekannte Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Sie sind nicht berechtigt, auf diese Resource zuzugreifen"
 
@@ -3220,6 +3298,10 @@ msgstr "Sie sind nicht berechtigt, auf diese Resource zuzugreifen"
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Sie sind nicht berechtigt, auf diese Resource zuzugreifen. "
 
@@ -3235,11 +3317,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Fehlerhafte Anfrage. Es wurde kein 'mode' Parameter übergeben."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Fehlerhafte Anfrage. 'Mode' Parameter ist ungültig"
 
@@ -3278,6 +3364,9 @@ msgstr "Zum Smart Block hinzufügen"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Löschen"
 
@@ -3291,6 +3380,7 @@ msgstr "Duplizierte Playlist"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Ändern"
 
@@ -3374,16 +3464,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Stream-Einstellungen aktualisiert."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "Pfad muß angegeben werden"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem mit Liquidsoap ..."
 
@@ -3562,6 +3655,8 @@ msgstr "Show Source Connection URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Erforderlich)"
 
@@ -3589,26 +3684,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(Ausschließlich zu Kontrollzwecken, wird nicht veröffentlicht)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Hinweis: Grafiken, die größer als 600x600 sind, werden verkleinert."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Zeige mir was ich sende "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Allgemeine Geschäftsbedingungen"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -3637,6 +3742,7 @@ msgid "Remove watched directory"
 msgstr "Überwachten Ordner entfernen"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Sie überwachen keine Medienordner."
 
@@ -3815,14 +3921,17 @@ msgid "Stream Settings"
 msgstr "Stream Einstellungen"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Globale Einstellungen"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Stream-Ausgabe Einstellungen"
 
@@ -3940,14 +4049,17 @@ msgid "Limit to "
 msgstr "Beschränken auf "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -4007,6 +4119,7 @@ msgid "Then you're good to go!"
 msgstr "Dann kann es auch schon los gehen!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr ""
@@ -4312,6 +4425,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Wiederholung der Sendung %s von %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Land wählen"
 
@@ -4426,6 +4541,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Der Kalender den sie sehen ist nicht mehr aktuell!"
 
@@ -4464,6 +4581,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Eine der gewählten Dateien existiert nicht!"
 
@@ -4530,75 +4649,98 @@ msgstr "Metadaten der aufgezeichneten Datei anzeigen"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Sendungsinhalt"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Gesamten Inhalt entfernen"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Aktuelle Sendung abbrechen"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Diese Folge bearbeiten"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Sendung ändern"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Diese Folge löschen"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Diese Folge und alle folgenden löschen"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr ""
 "Wiederkehrende Sendungen können nicht per Drag'n'Drop verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr ""
 "Eine in der Vergangenheit liegende Sendung kann nicht verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Eine Sendung kann nicht in die Vergangenheit verschoben werden."
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Eine aufgezeichnete Sendung kann nicht verschoben werden, wenn der Zeitpunkt "
 "der Wiederholung weniger als eine Stunde bevor liegt."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr ""
 "Die Sendung wurde gelöscht, weil die aufgezeichnete Sendung nicht existiert!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr ""
 "Das Wiederholen einer Sendung ist erst nach einer Stunde Wartezeit möglich."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Titel"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Abgespielt"
 
@@ -4626,6 +4768,7 @@ msgid "No Records"
 msgstr "Keine Aufzeichnungen"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4633,6 +4776,7 @@ msgstr ""
 "aktiviert sein)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Datenschutzrichtlinie"
 
@@ -4731,120 +4875,152 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Sender auf Sourcefabric.org veröffentlichen"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Sender auf Sourcefabric.org veröffentlichen"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Hiermit akzeptiere ich die %sDatenschutzrichtlinien%s von Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Hiermit akzeptiere ich die %sDatenschutzrichtlinien%s von Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Verwende Airtime-Login:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Verwende Airtime-Login:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Datei existiert nicht in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Datei existiert nicht in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Datei existiert nicht in Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Datei existiert nicht in Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Datei existiert nicht in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Datei existiert nicht in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Version"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Version"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Helfen sie Airtime, indem sie uns wissen lassen, wie sie es verwenden. "
-#~ "Diese Informationen werden regelmäßig gesammelt, um Ihre Nutzererfahrung "
-#~ "zu verbessern.%sDrücken sie auf 'Ja, Airtime helfen' und wir versichern, "
-#~ "die von ihnen verwendeten Features laufend zu verbessern. "
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Helfen sie Airtime, indem sie uns wissen lassen, wie sie es verwenden. Diese "
+"Informationen werden regelmäßig gesammelt, um Ihre Nutzererfahrung zu "
+"verbessern.%sDrücken sie auf 'Ja, Airtime helfen' und wir versichern, die "
+"von ihnen verwendeten Features laufend zu verbessern. "
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation "
-#~ "auf %sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
-#~ "aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback "
-#~ "gesammelt."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation auf "
+"%sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
+"aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback gesammelt."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Überwachte Verzeichnisse nochmals durchsuchen\n"
-#~ "(Dies könnte nützlich sein, wenn Airtime beim Synchronisieren mit "
-#~ "Netzlaufwerken Schwierigkeiten hat)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Überwachte Verzeichnisse nochmals durchsuchen\n"
+"(Dies könnte nützlich sein, wenn Airtime beim Synchronisieren mit "
+"Netzlaufwerken Schwierigkeiten hat)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Willkommen bei Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Willkommen bei Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Starten sie hier, um die ersten Schritte für die Automation ihrer Radio "
-#~ "Station zu erfahren."
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Starten sie hier, um die ersten Schritte für die Automation ihrer Radio "
+"Station zu erfahren."
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, die Open Source Radio Software für Programplanung und "
-#~ "Remote Radioverwaltung. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, die Open Source Radio Software für Programplanung und Remote "
+"Radioverwaltung. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime Passwort zurücksetzen"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime Passwort zurücksetzen"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. Alle Rechte vorbehalten."
-#~ "%sGepflegt und vertrieben unter GNU GPL v.3 von %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. Alle Rechte vorbehalten."
+"%sGepflegt und vertrieben unter GNU GPL v.3 von %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
-#~ "Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
-#~ "Benutzer zu fördern.%sAktivieren sie die Option 'Support Feedback senden' "
-#~ "und wir versichern, die von ihnen verwendeten Funktionen laufend zu "
-#~ "verbessern."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Helfen sie Airtime, indem sie uns erzählen, wie sie damit arbeiten. Diese "
+"Informationen werden regelmäßig gesammelt, um die Erfahrungswerte der "
+"Benutzer zu fördern.%sAktivieren sie die Option 'Support Feedback senden' "
+"und wir versichern, die von ihnen verwendeten Funktionen laufend zu "
+"verbessern."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation "
-#~ "auf %sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
-#~ "aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback "
-#~ "gesammelt."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Mit Aktivierung des unteren Kästchens werben sie für ihre Radiostation auf "
+"%sSourcefabric.org%s. Dazu muss die Option 'Support Feedback senden' "
+"aktiviert sein. Diese Daten werden zusätzlich zum Support Feedback gesammelt."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime wird vertrieben unter %s GNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime wird vertrieben unter %s GNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Willkommen zur Online Artime Demo!\n"
-#~ "Sie können sich mit dem Benutzernamen 'admin' und dem Passwort 'admin' "
-#~ "anmelden."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Willkommen zur Online Artime Demo!\n"
+"Sie können sich mit dem Benutzernamen 'admin' und dem Passwort 'admin' "
+"anmelden."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Kaufen sie eine Kopie von Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Kaufen sie eine Kopie von Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Die Länge einer vergangenen Sendung kann nicht verändert werden."
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Die Länge einer vergangenen Sendung kann nicht verändert werden."
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Sendungen sollten nicht überlappen"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Sendungen sollten nicht überlappen"
diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
index 160663738..7d8d937fb 100644
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Ζωντανό Stream"
 
@@ -181,6 +182,7 @@ msgstr "Κωδικός πρόσβασης"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Είδος"
 
@@ -321,6 +323,8 @@ msgstr "Ιστοσελίδα:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Γλώσσα:"
 
@@ -343,6 +347,10 @@ msgstr "Γλώσσα:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -360,6 +368,9 @@ msgstr "Ακύρωση"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Όνομα Χρήστη:"
 
@@ -367,22 +378,31 @@ msgstr "Όνομα Χρήστη:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Επαλήθευση κωδικού πρόσβασης"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Όνομα:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Επώνυμο:"
 
@@ -391,55 +411,70 @@ msgstr "Επώνυμο:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Κινητό Τηλέφωνο:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Τύπος Χρήστη:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Επισκέπτης"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Διευθυντής Προγράμματος"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Διαχειριστής"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Το όνομα εισόδου δεν είναι μοναδικό."
 
@@ -532,10 +567,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Σύνδεση"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Πληκτρολογήστε τους χαρακτήρες που βλέπετε στην παρακάτω εικόνα."
 
@@ -887,6 +924,7 @@ msgstr "Επιλέξτε κριτήρια"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -908,6 +946,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Συνθέτης"
 
@@ -916,6 +956,7 @@ msgstr "Συνθέτης"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Ενορχήστρωση"
 
@@ -925,6 +966,8 @@ msgstr "Ενορχήστρωση"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -936,6 +979,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Δημιουργός"
 
@@ -951,6 +997,7 @@ msgstr "Κωδικοποιήθηκε από"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -959,6 +1006,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Εταιρεία"
 
@@ -967,6 +1015,7 @@ msgstr "Εταιρεία"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Γλώσσα"
 
@@ -991,6 +1040,8 @@ msgstr "Τελευταία αναπαραγωγή"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Διάρκεια"
 
@@ -1006,6 +1057,7 @@ msgstr "Μίμος"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Διάθεση"
 
@@ -1036,6 +1088,9 @@ msgstr "Ρυθμός Δειγματοληψίας (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Τίτλος"
 
@@ -1065,6 +1120,7 @@ msgstr "Ιστοσελίδα"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Έτος"
 
@@ -1328,6 +1384,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Πρέπει να συμφωνείτε με την πολιτική προστασίας προσωπικών δεδομένων."
 
@@ -1338,11 +1396,13 @@ msgstr "Απαιτείται αξία και δεν μπορεί να είναι
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Ώρα Έναρξης"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Ώρα Τέλους"
 
@@ -1521,6 +1581,12 @@ msgstr "Δεν μπορεί να έχει διάρκεια μεγαλύτερη
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Δεν είναι δυνατός ο προγραμματισμός αλληλοεπικαλυπτόμενων εκπομπών"
 
@@ -1695,6 +1761,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Απόδοση Creative Commons Μη Εμπορική Χρήση Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Interface Ζώνης ώρας:"
 
@@ -1729,6 +1796,7 @@ msgid "Email Address"
 msgstr "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1750,6 +1818,7 @@ msgstr "Άκυρες μορφές αξίας."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Παρακαλώ εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασής σας"
 
@@ -1760,6 +1829,7 @@ msgstr "Άκυρο όνομα χρήστη ή κωδικός πρόσβασης.
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1769,6 +1839,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Το email δεν βρέθηκε."
 
@@ -1787,16 +1858,19 @@ msgstr "Λήψη"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Ο χρήστης προστέθηκε επιτυχώς!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Ο χρήστης ενημερώθηκε με επιτυχία!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Οι ρυθμίσεις ενημερώθηκαν επιτυχώς!"
 
@@ -1969,6 +2043,7 @@ msgstr "Φόρτωση..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Όλα"
 
@@ -2761,6 +2836,8 @@ msgstr "Άνοιγμα βιβλιοθήκης για προσθήκη ή αφα
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Προσθήκη / Αφαίρεση Περιεχομένου"
 
@@ -3191,6 +3268,7 @@ msgstr "Άγνωστη λίστα αναπαραγωγής"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Δεν έχετε δικαίωμα πρόσβασης σε αυτό το βοήθημα"
 
@@ -3205,6 +3283,10 @@ msgstr "Δεν έχετε δικαίωμα πρόσβασης σε αυτό το
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Δεν έχετε δικαίωμα πρόσβασης σε αυτό το βοήθημα. "
 
@@ -3220,11 +3302,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Λανθασμένο αίτημα. Η παράμετρος «κατάσταση» δεν πέρασε."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Λανθασμένο αίτημα. Η παράμετρος «κατάσταση» δεν είναι έγκυρη"
 
@@ -3263,6 +3349,9 @@ msgstr "Προσθήκη στο Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -3276,6 +3365,7 @@ msgstr "Αντιγραφή Λίστας Αναπαραγωγής"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Επεξεργασία"
 
@@ -3356,16 +3446,19 @@ msgstr "Σχόλια Υποστήριξης"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Η Ρύθμιση Stream Ενημερώθηκε."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "η διαδρομή πρέπει να καθοριστεί"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Πρόβλημα με Liquidsoap ..."
 
@@ -3544,6 +3637,8 @@ msgstr "Εμφάνιση Πηγής URL Σύνδεσης:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Απαιτείται)"
 
@@ -3571,26 +3666,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(Μόνο για σκοπούς επαλήθευσης, δεν θα δημοσιευθεί)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Σημείωση: Οτιδήποτε μεγαλύτερο από 600x600 θα αλλάξει μέγεθος."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Δείξε μου τι στέλνω "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Όροι και Προϋποθέσεις"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Επαναφορά κωδικού πρόσβασης"
 
@@ -3619,6 +3724,7 @@ msgid "Remove watched directory"
 msgstr "Αφαίρεση προβεβλημμένου ευρετηρίου"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Δεν παρακολουθείτε κανέναν φάκελο πολυμέσων."
 
@@ -3798,14 +3904,17 @@ msgid "Stream Settings"
 msgstr "Ρυθμίσεις Stream"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Γενικές ρυθμίσεις"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "βΔ"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Ρυθμίσεις Stream Εξόδου"
 
@@ -3924,14 +4033,17 @@ msgid "Limit to "
 msgstr "Όριο για "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3991,6 +4103,7 @@ msgid "Then you're good to go!"
 msgstr "Και είστε έτοιμοι!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Για περισσότερες αναλυτικές οδηγίες, διαβάστε το %sεγχειρίδιο%s ."
@@ -4295,6 +4408,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Αναμετάδοση του %s από %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Επιλέξτε Χώρα"
 
@@ -4405,6 +4520,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Το πρόγραμμα που βλέπετε δεν είναι ενημερωμένο!"
 
@@ -4441,6 +4558,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Ένα επιλεγμένο αρχείο δεν υπάρχει!"
 
@@ -4507,71 +4626,94 @@ msgstr "Προβολή εγγεγραμμένων Αρχείων Μεταδεδ
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Εμφάνιση Περιεχομένου"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Αφαίρεση Όλου του Περιεχομένου"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Ακύρωση Τρέχουσας Εκπομπής"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Επεξεργασία της Παρουσίας"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Επεξεργασία Εκπομπής"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Διαγραφή Της Παρουσίας"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Διαγραφή Της Παρουσίας και Όλων των Ακόλουθών της"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Δεν έχετε δικαίωμα πρόσβασης"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Δεν είναι δυνατό το drag and drop επαναλαμβανόμενων εκπομπών"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Δεν είναι δυνατή η μετακίνηση περασμένης εκπομπής"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Δεν είναι δυνατή η μετακίνηση εκπομπής στο παρελθόν"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Δεν είναι δυνατή η μετακίνηση ηχογραφημένης εκπομπής σε λιγότερο από 1 ώρα "
 "πριν από την αναμετάδοση της."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Η εκπομπή διεγράφη επειδή δεν υπάρχει ηχογραφημένη εκπομπή!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Πρέπει να περιμένετε 1 ώρα για την αναμετάδοση."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Κομμάτι"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Παίχτηκε"
 
@@ -4599,6 +4741,7 @@ msgid "No Records"
 msgstr "Κανένα Αρχείο"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4606,6 +4749,7 @@ msgstr ""
 "να είναι ενεργοποιημένη)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Πολιτική Προστασίας Προσωπικών Δεδομένων της Sourcefabric"
 
@@ -4704,119 +4848,152 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Προώθηση του σταθμού μου στην ιστοσελίδα  Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Προώθηση του σταθμού μου στην ιστοσελίδα  Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Με την επιλογή του πλαισίου, συμφωνώ με την %sπολιτική απορρήτου%s της "
-#~ "Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Με την επιλογή του πλαισίου, συμφωνώ με την %sπολιτική απορρήτου%s της "
+"Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Ταυτοποίηση Χρήστη Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Ταυτοποίηση Χρήστη Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Το αρχείο δεν υπάρχει στο Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Το αρχείο δεν υπάρχει στο Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Το αρχείο δεν υπάρχει στο Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Το αρχείο δεν υπάρχει στο Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Το αρχείο δεν υπάρχει στο Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Το αρχείο δεν υπάρχει στο Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Έκδοση Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Έκδοση Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Βοηθείστε στη βελτίωση του Airtime, ενημερώνοντας μας για την χρήση που "
-#~ "του κάνετε. Αυτές οι πληροφορίες θα συλλέγονται τακτικά, προκειμένου να "
-#~ "ενισχύσουν την εμπειρία των χρηστών σας. %sΚάντε κλικ στο κουμπί 'Ναι, "
-#~ "βοηθώ το Airtime' και θα βεβαιωθείτε ότι οι λειτουργίες που "
-#~ "χρησιμοποιείτε συνεχώς βελτιώνεται."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Βοηθείστε στη βελτίωση του Airtime, ενημερώνοντας μας για την χρήση που του "
+"κάνετε. Αυτές οι πληροφορίες θα συλλέγονται τακτικά, προκειμένου να "
+"ενισχύσουν την εμπειρία των χρηστών σας. %sΚάντε κλικ στο κουμπί 'Ναι, βοηθώ "
+"το Airtime' και θα βεβαιωθείτε ότι οι λειτουργίες που χρησιμοποιείτε συνεχώς "
+"βελτιώνεται."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Κάντε κλικ στο παρακάτω πλαίσιο για να διαφημίσετε το σταθμό σας στην "
-#~ "ιστοσελίδα %s Sourcefabric.org %s . Προκειμένου να το κάνετε πρέπει η "
-#~ "επιλογή 'Αποστολή σχολίων υποστήριξης» να είναι ενεργοποιημένη. Αυτά τα "
-#~ "δεδομένα θα συλλέγονται μαζί με τo feedback σας."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Κάντε κλικ στο παρακάτω πλαίσιο για να διαφημίσετε το σταθμό σας στην "
+"ιστοσελίδα %s Sourcefabric.org %s . Προκειμένου να το κάνετε πρέπει η "
+"επιλογή 'Αποστολή σχολίων υποστήριξης» να είναι ενεργοποιημένη. Αυτά τα "
+"δεδομένα θα συλλέγονται μαζί με τo feedback σας."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Επανασάρωση προβεβλημμένου ευρετηρίου (Αυτό είναι χρήσιμο αν το δίκτυο "
-#~ "στήριξης είναι εκτός συγχρονισμού με το Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Επανασάρωση προβεβλημμένου ευρετηρίου (Αυτό είναι χρήσιμο αν το δίκτυο "
+"στήριξης είναι εκτός συγχρονισμού με το Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Καλώς ήρθατε στο Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Καλώς ήρθατε στο Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Διαβάστε τις οδηγίες για να ξεκινήσετε να χρησιμοποιείται το Airtime, για "
-#~ "την αυτοματοποίηση των εκπομπών σας: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Διαβάστε τις οδηγίες για να ξεκινήσετε να χρησιμοποιείται το Airtime, για "
+"την αυτοματοποίηση των εκπομπών σας: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sΤο Airtime%s %s, το ανοικτού κώδικα λογισμικό για προγραμματισμό και "
-#~ "διαχείριση ραδιοφωνικών σταθμών εξ αποστάσεως. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sΤο Airtime%s %s, το ανοικτού κώδικα λογισμικό για προγραμματισμό και "
+"διαχείριση ραδιοφωνικών σταθμών εξ αποστάσεως. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Επαναφορά κωδικού πρόσβασης Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Επαναφορά κωδικού πρόσβασης Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. Διατήρηση όλων των "
-#~ "δικαιωμάτων.%sΣυντήρηση και διανομή από GNU GPL v.3 by %sSourcefabric o.p."
-#~ "s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. Διατήρηση όλων των δικαιωμάτων."
+"%sΣυντήρηση και διανομή από GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Βοηθείστε το Airtime ενημερώνοντας τη Sourcefabric για τη χρήση που του "
-#~ "κάνετε. Αυτές οι πληροφορίες θα συλλέγονται τακτικά, προκειμένου να "
-#~ "ενισχύσουν την εμπειρία των χρηστών σας. %s Κάντε κλικ στο πλαίσιο "
-#~ "Αποστολή σχολίων υποστήριξης» και θα βεβαιωθείτε ότι οι λειτουργίες που "
-#~ "χρησιμοποιείτε βελτιώνοται συνεχώς."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Βοηθείστε το Airtime ενημερώνοντας τη Sourcefabric για τη χρήση που του "
+"κάνετε. Αυτές οι πληροφορίες θα συλλέγονται τακτικά, προκειμένου να "
+"ενισχύσουν την εμπειρία των χρηστών σας. %s Κάντε κλικ στο πλαίσιο Αποστολή "
+"σχολίων υποστήριξης» και θα βεβαιωθείτε ότι οι λειτουργίες που "
+"χρησιμοποιείτε βελτιώνοται συνεχώς."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Κάντε κλικ στο παρακάτω πλαίσιο για να προωθήσετε τον σταθμό σας στην "
-#~ "ιστοσελίδα %sSourcefabric.org%s ."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Κάντε κλικ στο παρακάτω πλαίσιο για να προωθήσετε τον σταθμό σας στην "
+"ιστοσελίδα %sSourcefabric.org%s ."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%s Sourcefabric%s o.p.s. Το Airtime διανέμεται υπό %s GNU GPL v.3 %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%s Sourcefabric%s o.p.s. Το Airtime διανέμεται υπό %s GNU GPL v.3 %s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Καλώς ήρθατε στο online demo του Airtime! Μπορείτε να συνδεθείτε "
-#~ "χρησιμοποιώντας το όνομα χρήστη «admin» και τον κωδικό πρόσβασης «admin»."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Καλώς ήρθατε στο online demo του Airtime! Μπορείτε να συνδεθείτε "
+"χρησιμοποιώντας το όνομα χρήστη «admin» και τον κωδικό πρόσβασης «admin»."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Αγοράστε το δικό σας αντίγραφο του Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Αγοράστε το δικό σας αντίγραφο του Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Δεν είναι δυνατή η αλλαγή μεγέθους παρελθοντικής εκπομπής"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Δεν είναι δυνατή η αλλαγή μεγέθους παρελθοντικής εκπομπής"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Αδύνατη η αλληλοεπικάλυψη εκπομπών"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Αδύνατη η αλληλοεπικάλυψη εκπομπών"
diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
index 42c7a957f..a01637d21 100644
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -181,6 +182,7 @@ msgstr "Password"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genre"
 
@@ -321,6 +323,8 @@ msgstr "Website:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Language:"
 
@@ -343,6 +347,10 @@ msgstr "Language:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Save"
 
@@ -360,6 +368,9 @@ msgstr "Cancel"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Username:"
 
@@ -367,22 +378,31 @@ msgstr "Username:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Verify Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "First name:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Last name:"
 
@@ -391,55 +411,70 @@ msgstr "Last name:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobile Phone:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "User Type:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Guest"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Program Manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
@@ -532,10 +567,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Login"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Type the characters you see in the picture below."
 
@@ -886,6 +923,7 @@ msgstr "Select criteria"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Composer"
 
@@ -915,6 +955,7 @@ msgstr "Composer"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Conductor"
 
@@ -924,6 +965,8 @@ msgstr "Conductor"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -935,6 +978,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creator"
 
@@ -950,6 +996,7 @@ msgstr "Encoded By"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Label"
 
@@ -966,6 +1014,7 @@ msgstr "Label"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Language"
 
@@ -990,6 +1039,8 @@ msgstr "Last Played"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Length"
 
@@ -1005,6 +1056,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Mood"
 
@@ -1035,6 +1087,9 @@ msgstr "Sample Rate (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Title"
 
@@ -1064,6 +1119,7 @@ msgstr "Website"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Year"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "You have to agree to privacy policy."
 
@@ -1337,11 +1395,13 @@ msgstr "Value is required and can't be empty"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Start Time"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "End Time"
 
@@ -1517,6 +1577,12 @@ msgstr "Cannot have duration greater than 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Cannot schedule overlapping shows"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Interface Timezone:"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "Email Address"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1747,6 +1815,7 @@ msgstr "Invalid form values."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Please enter your user name and password"
 
@@ -1757,6 +1826,7 @@ msgstr "Wrong username or password provided. Please try again."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1766,6 +1836,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Given email not found."
 
@@ -1784,16 +1855,19 @@ msgstr "Download"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "User added successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "User updated successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Settings updated successfully!"
 
@@ -1964,6 +2038,7 @@ msgstr "Loading..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "All"
 
@@ -2743,6 +2818,8 @@ msgstr "Open library to add or remove content"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Add / Remove Content"
 
@@ -3171,6 +3248,7 @@ msgstr "Unknown Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "You are not allowed to access this resource."
 
@@ -3185,6 +3263,10 @@ msgstr "You are not allowed to access this resource."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "You are not allowed to access this resource. "
 
@@ -3200,11 +3282,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Bad request. no 'mode' parameter passed."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Bad request. 'mode' parameter is invalid"
 
@@ -3243,6 +3329,9 @@ msgstr "Add to Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Delete"
 
@@ -3256,6 +3345,7 @@ msgstr "Duplicate Playlist"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Edit"
 
@@ -3336,16 +3426,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Stream Setting Updated."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "path should be specified"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem with Liquidsoap..."
 
@@ -3524,6 +3617,8 @@ msgstr "Show Source Connection URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Required)"
 
@@ -3551,26 +3646,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(for verification purposes only, will not be published)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Note: Anything larger than 600x600 will be resized."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Show me what I am sending "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Terms and Conditions"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Reset password"
 
@@ -3599,6 +3704,7 @@ msgid "Remove watched directory"
 msgstr "Remove watched directory"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "You are not watching any media folders."
 
@@ -3777,14 +3883,17 @@ msgid "Stream Settings"
 msgstr "Stream Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Global Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Output Stream Settings"
 
@@ -3902,14 +4011,17 @@ msgid "Limit to "
 msgstr "Limit to "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3966,6 +4078,7 @@ msgid "Then you're good to go!"
 msgstr "Then you're good to go!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "For more detailed help, read the %suser manual%s."
@@ -4268,6 +4381,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Rebroadcast of %s from %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Select Country"
 
@@ -4374,6 +4489,8 @@ msgstr "The schedule you're viewing is out of date! (instance mismatch)"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "The schedule you're viewing is out of date!"
 
@@ -4410,6 +4527,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "A selected File does not exist!"
 
@@ -4475,69 +4594,92 @@ msgstr "View Recorded File Metadata"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Show Content"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Remove All Content"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancel Current Show"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Edit This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Edit Show"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Delete This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Delete This Instance and All Following"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Can't drag and drop repeating shows"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Can't move a past show"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Can't move show into past"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "Can't move a recorded show less than 1 hour before its rebroadcasts."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Show was deleted because recorded show does not exist!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Must wait 1 hour to rebroadcast."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Track"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Played"
 
@@ -4565,12 +4707,14 @@ msgid "No Records"
 msgstr "No Records"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Privacy Policy"
 
@@ -4668,111 +4812,145 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promote my station on Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promote my station on Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Use Airtime Authentication:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Use Airtime Authentication:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "File does not exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "File does not exist in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "File does not exist in Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "File does not exist in Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "File doesn't exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "File doesn't exist in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Version"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Version"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Welcome to Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Welcome to Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime Password Reset"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime Password Reset"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Click the box below to promote your station on %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "Click the box below to promote your station on %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Purchase your copy of Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Purchase your copy of Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "can't resize a past show"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "can't resize a past show"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Should not overlap shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Should not overlap shows"
diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
index 8fee19f24..7582f3318 100644
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
@@ -104,6 +104,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -184,6 +185,7 @@ msgstr "Password"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genre"
 
@@ -324,6 +326,8 @@ msgstr "Website:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Language:"
 
@@ -346,6 +350,10 @@ msgstr "Language:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Save"
 
@@ -363,6 +371,9 @@ msgstr "Cancel"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Username:"
 
@@ -370,22 +381,31 @@ msgstr "Username:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Verify Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Firstname:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Lastname:"
 
@@ -394,55 +414,70 @@ msgstr "Lastname:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobile Phone:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "User Type:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Guest"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Program Manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
@@ -535,10 +570,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Login"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Type the characters you see in the picture below."
 
@@ -889,6 +926,7 @@ msgstr "Select criteria"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -910,6 +948,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Composer"
 
@@ -918,6 +958,7 @@ msgstr "Composer"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Conductor"
 
@@ -927,6 +968,8 @@ msgstr "Conductor"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -938,6 +981,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creator"
 
@@ -953,6 +999,7 @@ msgstr "Encoded By"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -961,6 +1008,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Label"
 
@@ -969,6 +1017,7 @@ msgstr "Label"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Language"
 
@@ -993,6 +1042,8 @@ msgstr "Last Played"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Length"
 
@@ -1008,6 +1059,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Mood"
 
@@ -1038,6 +1090,9 @@ msgstr "Sample Rate (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Title"
 
@@ -1067,6 +1122,7 @@ msgstr "Website"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Year"
 
@@ -1328,6 +1384,8 @@ msgstr "By checking this box, I agree to %s's %sprivacy policy%s."
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "You have to agree to privacy policy."
 
@@ -1338,11 +1396,13 @@ msgstr "Value is required and can't be empty"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Start Time"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "End Time"
 
@@ -1518,6 +1578,12 @@ msgstr "Cannot have duration greater than 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Cannot schedule overlapping shows"
 
@@ -1692,6 +1758,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Interface Timezone:"
 
@@ -1726,6 +1793,7 @@ msgid "Email Address"
 msgstr "Email Address"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Invalid form values."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Please enter your user name and password"
 
@@ -1756,6 +1825,7 @@ msgstr "Wrong username or password provided. Please try again."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1765,6 +1835,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Given email not found."
 
@@ -1783,16 +1854,19 @@ msgstr "Download"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "User added successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "User updated successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Settings updated successfully!"
 
@@ -1963,6 +2037,7 @@ msgstr "Loading..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "All"
 
@@ -2742,6 +2817,8 @@ msgstr "Open library to add or remove content"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Add / Remove Content"
 
@@ -3170,6 +3247,7 @@ msgstr "Unknown Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "You are not allowed to access this resource."
 
@@ -3184,6 +3262,10 @@ msgstr "You are not allowed to access this resource."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "You are not allowed to access this resource. "
 
@@ -3196,11 +3278,15 @@ msgstr "File does not exist in %s"
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Bad request. no 'mode' parameter passed."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Bad request. 'mode' parameter is invalid"
 
@@ -3239,6 +3325,9 @@ msgstr "Add to Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Delete"
 
@@ -3252,6 +3341,7 @@ msgstr "Duplicate Playlist"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Edit"
 
@@ -3332,16 +3422,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Stream Setting Updated."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "path should be specified"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem with Liquidsoap..."
 
@@ -3520,6 +3613,8 @@ msgstr "Show Source Connection URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Required)"
 
@@ -3550,26 +3645,36 @@ msgstr "Click the box below to promote your station on %s."
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(for verification purposes only, will not be published)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Note: Anything larger than 600x600 will be resized."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Show me what I am sending "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Terms and Conditions"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Reset password"
 
@@ -3600,6 +3705,7 @@ msgid "Remove watched directory"
 msgstr "Remove watched directory"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "You are not watching any media folders."
 
@@ -3778,14 +3884,17 @@ msgid "Stream Settings"
 msgstr "Stream Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Global Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Output Stream Settings"
 
@@ -3903,14 +4012,17 @@ msgid "Limit to "
 msgstr "Limit to "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3967,6 +4079,7 @@ msgid "Then you're good to go!"
 msgstr "Then you're ready to broadcast!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "For more detailed help, read the %suser manual%s."
@@ -4273,6 +4386,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Rebroadcast of %s from %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Select Country"
 
@@ -4379,6 +4494,8 @@ msgstr "The schedule you're viewing is out of date! (instance mismatch)"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "The schedule you're viewing is out of date!"
 
@@ -4415,6 +4532,8 @@ msgstr "Cannot schedule a playlist that contains missing files."
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "A selected File does not exist!"
 
@@ -4480,69 +4599,92 @@ msgstr "View Recorded File Metadata"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Show Content"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Remove All Content"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancel Current Show"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Edit This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Edit Show"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Delete This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Delete This Instance and All Following"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Can't drag and drop repeating shows"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Can't move a past show"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Can't move show into past"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "Can't move a recorded show less than 1 hour before its rebroadcasts."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Show was deleted because recorded show does not exist!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Must wait 1 hour to rebroadcast."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Track"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Played"
 
@@ -4570,12 +4712,14 @@ msgid "No Records"
 msgstr "No Records"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Privacy Policy"
 
@@ -4677,111 +4821,145 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr "Purchase your copy of %s"
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promote my station on Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promote my station on Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Use Airtime Authentication:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Use Airtime Authentication:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "File does not exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "File does not exist in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "File does not exist in Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "File does not exist in Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "File doesn't exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "File doesn't exist in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Version"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Version"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Welcome to Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Welcome to Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime Password Reset"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime Password Reset"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Click the box below to promote your station on %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "Click the box below to promote your station on %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Purchase your copy of Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Purchase your copy of Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "can't resize a past show"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "can't resize a past show"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Should not overlap shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Should not overlap shows"
diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
index 5cfba6ace..6c126264e 100644
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -181,6 +182,7 @@ msgstr "Password"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genre"
 
@@ -321,6 +323,8 @@ msgstr "Website:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Language:"
 
@@ -343,6 +347,10 @@ msgstr "Language:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Save"
 
@@ -360,6 +368,9 @@ msgstr "Cancel"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Username:"
 
@@ -367,22 +378,31 @@ msgstr "Username:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Verify Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Firstname:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Lastname:"
 
@@ -391,55 +411,70 @@ msgstr "Lastname:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobile Phone:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "User Type:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Guest"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Program Manager"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
@@ -532,10 +567,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Login"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Type the characters you see in the picture below."
 
@@ -886,6 +923,7 @@ msgstr "Select criteria"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Composer"
 
@@ -915,6 +955,7 @@ msgstr "Composer"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Conductor"
 
@@ -924,6 +965,8 @@ msgstr "Conductor"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -935,6 +978,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creator"
 
@@ -950,6 +996,7 @@ msgstr "Encoded By"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Label"
 
@@ -966,6 +1014,7 @@ msgstr "Label"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Language"
 
@@ -990,6 +1039,8 @@ msgstr "Last Played"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Length"
 
@@ -1005,6 +1056,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Mood"
 
@@ -1035,6 +1087,9 @@ msgstr "Sample Rate (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Title"
 
@@ -1064,6 +1119,7 @@ msgstr "Website"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Year"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "You have to agree to privacy policy."
 
@@ -1337,11 +1395,13 @@ msgstr "Value is required and can't be empty"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Start Time"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "End Time"
 
@@ -1517,6 +1577,12 @@ msgstr "Cannot have duration greater than 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Cannot schedule overlapping shows"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Interface Timezone:"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "Email Address"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1745,6 +1813,7 @@ msgstr "Invalid form values."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Please enter your user name and password"
 
@@ -1755,6 +1824,7 @@ msgstr "Wrong username or password provided. Please try again."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1764,6 +1834,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Given email not found."
 
@@ -1782,16 +1853,19 @@ msgstr "Download"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "User added successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "User updated successfully!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Settings updated successfully!"
 
@@ -1962,6 +2036,7 @@ msgstr "Loading..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "All"
 
@@ -2741,6 +2816,8 @@ msgstr "Open library to add or remove content"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Add / Remove Content"
 
@@ -3169,6 +3246,7 @@ msgstr "Unknown Playlist"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "You are not allowed to access this resource."
 
@@ -3183,6 +3261,10 @@ msgstr "You are not allowed to access this resource."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "You are not allowed to access this resource. "
 
@@ -3198,11 +3280,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Bad request. no 'mode' parameter passed."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Bad request. 'mode' parameter is invalid"
 
@@ -3241,6 +3327,9 @@ msgstr "Add to Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Delete"
 
@@ -3254,6 +3343,7 @@ msgstr "Duplicate Playlist"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Edit"
 
@@ -3334,16 +3424,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Stream Setting Updated."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "path should be specified"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem with Liquidsoap..."
 
@@ -3522,6 +3615,8 @@ msgstr "Show Source Connection URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Required)"
 
@@ -3549,26 +3644,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(for verification purposes only, will not be published)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Note: Anything larger than 600x600 will be resized."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Show me what I am sending "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Terms and Conditions"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Reset password"
 
@@ -3597,6 +3702,7 @@ msgid "Remove watched directory"
 msgstr "Remove watched directory"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "You are not watching any media folders."
 
@@ -3775,14 +3881,17 @@ msgid "Stream Settings"
 msgstr "Stream Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Global Settings"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Output Stream Settings"
 
@@ -3900,14 +4009,17 @@ msgid "Limit to "
 msgstr "Limit to "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3964,6 +4076,7 @@ msgid "Then you're good to go!"
 msgstr "Then you're good to go!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "For more detailed help, read the %suser manual%s."
@@ -4266,6 +4379,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Rebroadcast of %s from %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Select Country"
 
@@ -4372,6 +4487,8 @@ msgstr "The schedule you're viewing is out of date! (instance mismatch)"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "The schedule you're viewing is out of date!"
 
@@ -4408,6 +4525,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "A selected File does not exist!"
 
@@ -4473,69 +4592,92 @@ msgstr "View Recorded File Metadata"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Show Content"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Remove All Content"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancel Current Show"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Edit This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Edit Show"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Delete This Instance"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Delete This Instance and All Following"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Can't drag and drop repeating shows"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Can't move a past show"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Can't move show into past"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "Can't move a recorded show less than 1 hour before its rebroadcasts."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Show was deleted because recorded show does not exist!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Must wait 1 hour to rebroadcast."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Track"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Played"
 
@@ -4563,12 +4705,14 @@ msgid "No Records"
 msgstr "No Records"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Privacy Policy"
 
@@ -4666,111 +4810,145 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promote my station on Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promote my station on Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Use Airtime Authentication:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Use Airtime Authentication:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "File does not exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "File does not exist in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "File does not exist in Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "File does not exist in Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "File doesn't exist in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "File doesn't exist in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Version"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Version"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Welcome to Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Welcome to Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime Password Reset"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime Password Reset"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Click the box below to promote your station on %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "Click the box below to promote your station on %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Purchase your copy of Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Purchase your copy of Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "can't resize a past show"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "can't resize a past show"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Should not overlap shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Should not overlap shows"
diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
index 7ec199881..4758c6547 100644
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Stream en vivo"
 
@@ -181,6 +182,7 @@ msgstr "Contraseña"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Género"
 
@@ -321,6 +323,8 @@ msgstr "Sitio web:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Idioma:"
 
@@ -343,6 +347,10 @@ msgstr "Idioma:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Guardar"
 
@@ -360,6 +368,9 @@ msgstr "Cancelar"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Usuario:"
 
@@ -367,22 +378,31 @@ msgstr "Usuario:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Contraseña:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Verificar contraseña:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Nombre:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Apellido:"
 
@@ -391,55 +411,70 @@ msgstr "Apellido:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Correo electrónico"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Celular:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Tipo de usuario:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Invitado"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Administrador de programa"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Admin"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Tu usuario no es único."
 
@@ -532,10 +567,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Ingreso"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr ""
 "Digita los caracteres que ves en la gráfica que aparece a continuación."
@@ -887,6 +924,7 @@ msgstr "Seleccionar criterio"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Álbum"
 
@@ -908,6 +946,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Compositor"
 
@@ -916,6 +956,7 @@ msgstr "Compositor"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Director"
 
@@ -925,6 +966,8 @@ msgstr "Director"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Derechos de autor"
 
@@ -936,6 +979,9 @@ msgstr "Derechos de autor"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creador"
 
@@ -951,6 +997,7 @@ msgstr "Codificado por"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -959,6 +1006,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Sello"
 
@@ -967,6 +1015,7 @@ msgstr "Sello"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Idioma"
 
@@ -991,6 +1040,8 @@ msgstr "Último reproducido"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Duración"
 
@@ -1006,6 +1057,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Estilo (mood)"
 
@@ -1036,6 +1088,9 @@ msgstr "Tasa de muestreo (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Título"
 
@@ -1065,6 +1120,7 @@ msgstr "Sitio web"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Año"
 
@@ -1329,6 +1385,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Debes aceptar las políticas de privacidad."
 
@@ -1339,11 +1397,13 @@ msgstr "El valor es necesario y no puede estar vacío"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1520,6 +1580,12 @@ msgstr "No puede tener una duración mayor a 24 horas"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "No se pueden programar shows traslapados"
 
@@ -1694,6 +1760,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Atribución-NoComercial-CompartirIgual Creative Commons"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1728,6 +1795,7 @@ msgid "Email Address"
 msgstr "Correo electrónico"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1749,6 +1817,7 @@ msgstr "Los valores en el formulario son inválidos."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Por favor ingresa tu usuario y contraseña"
 
@@ -1760,6 +1829,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1769,6 +1839,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "No se encontró ese correo electrónico."
 
@@ -1787,16 +1858,19 @@ msgstr "Descargar"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Se agregó exitosamente el usuario."
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Se actualizó exitosamente el usuario."
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "¡Configuraciones actualizadas con éxito!"
 
@@ -1969,6 +2043,7 @@ msgstr "Cargando..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Todo"
 
@@ -2744,6 +2819,8 @@ msgstr "Abrir biblioteca para agregar o eliminar contenido"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Agregar / eliminar contenido"
 
@@ -3173,6 +3250,7 @@ msgstr "Lista de reproducción desconocida"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "No tienes permiso para acceder a esta fuente."
 
@@ -3187,6 +3265,10 @@ msgstr "No tienes permiso para acceder a esta fuente."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "No tienes permiso para acceder a esta fuente."
 
@@ -3202,11 +3284,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Solicitud errónea.  Ningún parámetro 'mode' pasó."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Solicitud errónea.  El parámetro 'mode' es inválido"
 
@@ -3245,6 +3331,9 @@ msgstr "Agregar un bloque inteligente"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -3258,6 +3347,7 @@ msgstr "Lista de reproducción duplicada"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Editar"
 
@@ -3338,16 +3428,19 @@ msgstr "Tu estación en nuestro catálogo"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Se actualizaron las configuraciones del stream."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "se debe especificar la ruta"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Hay un problema con Liquidsoap..."
 
@@ -3526,6 +3619,8 @@ msgstr "URL de la conexión de la fuente del show"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Requerido)"
 
@@ -3553,26 +3648,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(únicamente para fines de verificación, no será publicado)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Nota:  cualquier cosa mayor a 600x600 será redimensionada."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Muéstrame lo que estoy enviando"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Términos y condiciones"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
@@ -3601,6 +3706,7 @@ msgid "Remove watched directory"
 msgstr "Remover el directorio monitoreado"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "No está monitoreando ninguna carpeta de medios."
 
@@ -3779,14 +3885,17 @@ msgid "Stream Settings"
 msgstr "Configuración de stream"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Configuración global"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Configuración de los streams de salida"
 
@@ -3904,14 +4013,17 @@ msgid "Limit to "
 msgstr "Límite hasta"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3971,6 +4083,7 @@ msgid "Then you're good to go!"
 msgstr "¡Estas listo para comenzar!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Para una ayuda más detallada, lee el manual%s del %susuario."
@@ -4275,6 +4388,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Retransmisión de %s desde %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Seleccionar país"
 
@@ -4385,6 +4500,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "¡La programación que estás viendo está desactualizada!"
 
@@ -4419,6 +4536,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "¡Un Archivo seleccionado no existe!"
 
@@ -4484,71 +4603,94 @@ msgstr "Ver los metadatos del archivo grabado"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Mostrar contenido"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Eliminar todo el contenido"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancelar el show actual"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Editar show"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Eliminar esta instancia"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Eliminar esta instancia y todas las que siguen"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "No es posible arrastrar y soltar shows que se repiten"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "No se puede mover un show pasado"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "No se puede mover un show al pasado"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "No se pueden mover shows grabados a menos de 1 hora antes de su "
 "retransmisión."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "El show se eliminó porque el show grabado no existe!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Debe esperar 1 hora para retransmitir."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Reproducido"
 
@@ -4576,6 +4718,7 @@ msgid "No Records"
 msgstr "No hay registros"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4583,6 +4726,7 @@ msgstr ""
 "retroalimentación de soporte) debe estar activado)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Política de privacidad de Sourcefabric"
 
@@ -4681,115 +4825,149 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promover mi estación en Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promover mi estación en Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Al seleccionar esta opción, acepto las %spolíticas de privacidad%s de "
-#~ "Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Al seleccionar esta opción, acepto las %spolíticas de privacidad%s de "
+"Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Use la autenticación de Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Use la autenticación de Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "El archivo no existe en Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "El archivo no existe en Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "El archivo no existe en Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "El archivo no existe en Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "El archivo no existe en Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "El archivo no existe en Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Versión de Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Versión de Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Ayúdenos a mejorar Airtime dándonos a conocer cómo lo está usando.  Esta "
-#~ "información se recopila con regularidad para mejorar la experiencia de "
-#~ "los usuarios.%s Haga clic en 'Sí, ayudar a Airtime' y nos aseguraremos de "
-#~ "que las funciones que más utiliza se mantengan bajo constante mejora."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Ayúdenos a mejorar Airtime dándonos a conocer cómo lo está usando.  Esta "
+"información se recopila con regularidad para mejorar la experiencia de los "
+"usuarios.%s Haga clic en 'Sí, ayudar a Airtime' y nos aseguraremos de que "
+"las funciones que más utiliza se mantengan bajo constante mejora."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Acepta la siguiente opción para anunciar tu estación en %sSourcefabric.org"
-#~ "%s.   A fin de promover tu estación debes activar la opción de 'Enviar "
-#~ "retroalimentación de soporte'.  Estos datos se recopilarán además de "
-#~ "dichos comentarios."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Acepta la siguiente opción para anunciar tu estación en %sSourcefabric.org"
+"%s.   A fin de promover tu estación debes activar la opción de 'Enviar "
+"retroalimentación de soporte'.  Estos datos se recopilarán además de dichos "
+"comentarios."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Re-escanear el directorio monitoreado (esto es útil si es un directorio "
-#~ "montado sobre una red y pudiera no estar en sincronía con Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Re-escanear el directorio monitoreado (esto es útil si es un directorio "
+"montado sobre una red y pudiera no estar en sincronía con Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "¡Bienvenido a Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "¡Bienvenido a Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr "Aprende aquí como usar Airtime para automatizar tus transmisiones:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr "Aprende aquí como usar Airtime para automatizar tus transmisiones:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, el software de código abierto para programar y "
-#~ "administrar estaciones de radio de forma remota. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, el software de código abierto para programar y administrar "
+"estaciones de radio de forma remota. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Restablecer contraseña de Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Restablecer contraseña de Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. Todos los derechos reservados."
-#~ "%sMantenido y distribuido bajo GNU GPL v.3 por %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. Todos los derechos reservados."
+"%sMantenido y distribuido bajo GNU GPL v.3 por %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Ayuda a mejorar Airtime informando a Sourcefabric sobre cómo lo estás "
-#~ "usando.  Esta información se recolectará regularmente para mejorar tu "
-#~ "experiencia como usuario. %sHaz clic en la casilla 'Send support "
-#~ "feedback' (Enviar retroalimentación de soporte) y procuraremos que las "
-#~ "funciones que usas mejoren constantemente."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Ayuda a mejorar Airtime informando a Sourcefabric sobre cómo lo estás "
+"usando.  Esta información se recolectará regularmente para mejorar tu "
+"experiencia como usuario. %sHaz clic en la casilla 'Send support "
+"feedback' (Enviar retroalimentación de soporte) y procuraremos que las "
+"funciones que usas mejoren constantemente."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Haz clic en la casilla de abajo para promocionar tu estación en "
-#~ "%sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Haz clic en la casilla de abajo para promocionar tu estación en "
+"%sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime se distribuye bajo la %sGNE GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime se distribuye bajo la %sGNE GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "¡Bienvenido al demo de Airtime en línea! Puedes ingresar usando el nombre "
-#~ "de usuario 'admin' y la contraseña 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"¡Bienvenido al demo de Airtime en línea! Puedes ingresar usando el nombre de "
+"usuario 'admin' y la contraseña 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Adquiere tu copia de Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Adquiere tu copia de Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "No puedes cambiar la duración de un show pasado"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "No puedes cambiar la duración de un show pasado"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "No debes traslapar shows"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "No debes traslapar shows"
diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
index b48cc424e..2a70d78c9 100644
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
@@ -1564,6 +1564,7 @@ msgstr "Ne peut pas avoir une durée supérieure à 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
 msgid "Cannot schedule overlapping shows"
 msgstr "Ne peux pas programmer des émissions qui se chevauchent"
 
@@ -4400,6 +4401,7 @@ msgstr "Rediffusion de %s à %s"
 #: airtime_mvc/application/models/Preference.php:666
 #: airtime_mvc/application/models/Preference.php:655
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
 msgid "Select Country"
 msgstr "Selectionner le Pays"
 
@@ -4674,11 +4676,13 @@ msgstr "Ne peux pas déplacer une émission diffusée"
 
 #: airtime_mvc/application/services/CalendarService.php:297
 #: airtime_mvc/application/services/CalendarService.php:281
+#: airtime_mvc/application/services/CalendarService.php:298
 msgid "Can't move show into past"
 msgstr "Ne peux pas déplacer une émission dans le passé"
 
 #: airtime_mvc/application/services/CalendarService.php:317
 #: airtime_mvc/application/services/CalendarService.php:301
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Impossible de déplacer une émission enregistrée à moins d'1 heure avant ses "
@@ -4686,6 +4690,7 @@ msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:327
 #: airtime_mvc/application/services/CalendarService.php:311
+#: airtime_mvc/application/services/CalendarService.php:328
 msgid "Show was deleted because recorded show does not exist!"
 msgstr ""
 "L'Emission a été éffacée parce que l'enregistrement de l'émission n'existe "
@@ -4693,6 +4698,7 @@ msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:334
 #: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:335
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Doit attendre 1 heure pour retransmettre."
 
diff --git a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
index 0c8e4242b..3f3eb5e45 100644
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Prijenos uživo"
 
@@ -181,6 +182,7 @@ msgstr "Lozinka"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Žanr"
 
@@ -321,6 +323,8 @@ msgstr "Web stranica:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Jezik:"
 
@@ -343,6 +347,10 @@ msgstr "Jezik:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Spremi"
 
@@ -360,6 +368,9 @@ msgstr "Otkaži"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Korisničko ime:"
 
@@ -367,22 +378,31 @@ msgstr "Korisničko ime:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Lozinka:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Potvrdi Lozinku:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Ime:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Prezime:"
 
@@ -391,55 +411,70 @@ msgstr "Prezime:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobitel:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Vrsta Korisnika:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Gost"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "Disk-džokej"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Voditelj Programa"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Administrator"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Ime prijave nije jedinstveno."
 
@@ -532,10 +567,12 @@ msgstr "Disk-Džokeji:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Prijava"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Upiši znakove koje vidiš na slici u nastavku."
 
@@ -886,6 +923,7 @@ msgstr "Odaberi kriterije"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Kompozitor"
 
@@ -915,6 +955,7 @@ msgstr "Kompozitor"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Dirigent"
 
@@ -924,6 +965,8 @@ msgstr "Dirigent"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Autorsko pravo"
 
@@ -935,6 +978,9 @@ msgstr "Autorsko pravo"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Tvorac"
 
@@ -950,6 +996,7 @@ msgstr "Kodirano je po"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Naljepnica"
 
@@ -966,6 +1014,7 @@ msgstr "Naljepnica"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Jezik"
 
@@ -990,6 +1039,8 @@ msgstr "Zadnji Put Odigrano"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Dužina"
 
@@ -1005,6 +1056,7 @@ msgstr "Mimika"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -1035,6 +1087,9 @@ msgstr "Uzorak Stopa (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Naziv"
 
@@ -1064,6 +1119,7 @@ msgstr "Web stranica"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Godina"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Moraš pristati na pravila o privatnosti."
 
@@ -1337,11 +1395,13 @@ msgstr "Vrijednost je potrebna i ne može biti prazan"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Vrijeme Početka"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Vrijeme Završetka"
 
@@ -1517,6 +1577,12 @@ msgstr "Ne može trajati više od 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Ne možeš zakazati preklapajuće emisije"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Imenovanje Nekomercijalno Dijeli Pod Istim Uvjetima"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Vremenska Zona Sučelja:"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "E-mail Adresa"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Nevažeći vrijednosti obrasca."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Molimo unesi svoje korisničko ime i lozinku"
 
@@ -1756,6 +1825,7 @@ msgstr "Pogrešno korisničko ime ili lozinka. Molimo pokušaj ponovno."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1765,6 +1835,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "S obzirom e-mail nije pronađen."
 
@@ -1783,16 +1854,19 @@ msgstr "Preuzimanje"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Korisnik je uspješno dodan!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Korisnik je uspješno ažuriran!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Postavke su uspješno ažurirane!"
 
@@ -1964,6 +2038,7 @@ msgstr "Učitavanje..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Sve"
 
@@ -2732,6 +2807,8 @@ msgstr "Otvori knjižnicu za dodavanje ili uklanjanje sadržaja"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Dodaj / Ukloni Sadržaj"
 
@@ -3160,6 +3237,7 @@ msgstr "Nepoznati Popis Pjesama"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Ne smiješ pristupiti ovog izvora."
 
@@ -3174,6 +3252,10 @@ msgstr "Ne smiješ pristupiti ovog izvora."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Ne smiješ pristupiti ovog izvora."
 
@@ -3189,11 +3271,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Neispravan zahtjev."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Neispravan zahtjev"
 
@@ -3232,6 +3318,9 @@ msgstr "Dodaj u Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -3245,6 +3334,7 @@ msgstr "Udvostručavanje"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Uredi"
 
@@ -3325,16 +3415,19 @@ msgstr "Povratne Informacije"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Prijenos Podešavanje je Ažurirano."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "put bi trebao biti specificiran"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem sa Liquidsoap..."
 
@@ -3513,6 +3606,8 @@ msgstr "URL veza Programskog izvora:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Obavezno)"
 
@@ -3540,26 +3635,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(služi samo za provjeru, neće biti objavljena)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Napomena: Sve veća od 600x600 će se mijenjati."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Pokaži mi što šaljem"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Uvjeti i Odredbe"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Resetuj lozinku"
 
@@ -3588,6 +3693,7 @@ msgid "Remove watched directory"
 msgstr "Ukloni nadzoranu direktoriju"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Ne pratiš nijedne medijske mape."
 
@@ -3766,14 +3872,17 @@ msgid "Stream Settings"
 msgstr "Prijenosne Postavke"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Globalne Postavke"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Izlazne Prijenosne Postavke"
 
@@ -3891,14 +4000,17 @@ msgid "Limit to "
 msgstr "Ograničeno za"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3955,6 +4067,7 @@ msgid "Then you're good to go!"
 msgstr "I već je završeno!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Za detaljnu pomoć, pročitaj %skorisnički priručnik%s."
@@ -4257,6 +4370,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Reemitiranje od %s od %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Odaberi Državu"
 
@@ -4363,6 +4478,8 @@ msgstr "Zastario se pregledan raspored! (primjer neusklađenost)"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Zastario se pregledan raspored!"
 
@@ -4399,6 +4516,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Odabrana Datoteka ne postoji!"
 
@@ -4465,71 +4584,94 @@ msgstr "Metapodaci Snimljenog Fajla"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Programski Sadržaj"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Ukloni Sve Sadržaje"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Prekid Programa"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Uredi u tom slučaju"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Uredi Programa"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Izbriši u tom slučaju"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Izbriši u tom slučaju i svi prateći"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Dozvola odbijena"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Ne možeš povući i ispustiti ponavljajuće emisije"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Ne možeš premjestiti događane emisije"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Ne možeš premjestiti emisiju u prošlosti"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Ne možeš premjestiti snimljene emisije ranije od 1 sat vremena prije njenih "
 "reemitiranja."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Emisija je izbrisana jer je snimljena emisija ne postoji!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Moraš pričekati 1 sat za re-emitiranje."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Pjesma"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Pušteno"
 
@@ -4557,6 +4699,7 @@ msgid "No Records"
 msgstr "Nema Zapisa"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4564,6 +4707,7 @@ msgstr ""
 "biti omogućena)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Pravila o Privatnosti"
 
@@ -4661,107 +4805,138 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promovirati svoju stanicu na Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promovirati svoju stanicu na Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "Odabirom ove opcije, slažem se %ssa pravilima o privatnosti%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "Odabirom ove opcije, slažem se %ssa pravilima o privatnosti%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Koristi Airtime provjeru autentičnosti:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Koristi Airtime provjeru autentičnosti:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Datoteka ne postoji."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Datoteka ne postoji."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Datoteka ne postoji"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Datoteka ne postoji"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Datoteke ne postoje."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Datoteke ne postoje."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Verzija"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Verzija"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Da, pomažem Airtime-u'."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Da, pomažem Airtime-u'."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Klikni na donji okvir za oglašavanje svoju stanicu na %sSourcefabric.org"
-#~ "%s. U cilju promicanja svoju stanicu, 'Pošalji povratne informacije' mora "
-#~ "biti omogućena. Ovi podaci će se prikupljati uz podršku poruci."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Klikni na donji okvir za oglašavanje svoju stanicu na %sSourcefabric.org%s. "
+"U cilju promicanja svoju stanicu, 'Pošalji povratne informacije' mora biti "
+"omogućena. Ovi podaci će se prikupljati uz podršku poruci."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Skeniraj ponovno praćenu direktoriju (Ovo je korisno ako je mrežna veza "
-#~ "nije sinkronizirana sa Airtime-om)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Skeniraj ponovno praćenu direktoriju (Ovo je korisno ako je mrežna veza nije "
+"sinkronizirana sa Airtime-om)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Dobrodošli kod Airtime-a!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Dobrodošli kod Airtime-a!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Evo kako možeš početi koristiti emitiranja za automatiziranje svoje "
-#~ "emisije:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Evo kako možeš početi koristiti emitiranja za automatiziranje svoje emisije:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, otvoreni radio softver za zakazivanje i daljinsko vođenje "
-#~ "postaje. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, otvoreni radio softver za zakazivanje i daljinsko vođenje "
+"postaje. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Resetiranje Lozinke"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Resetiranje Lozinke"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime vlasnik autorskih prava;Sourcefabric o.p.s. Sva prava pridržana."
-#~ "%sOdržavana i distribuira se pod GNU GPL v.3 od strane %sSourcefabric o.p."
-#~ "s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime vlasnik autorskih prava;Sourcefabric o.p.s. Sva prava pridržana."
+"%sOdržavana i distribuira se pod GNU GPL v.3 od strane %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Pošalji povratne "
-#~ "informacije'."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Molimo, pomozi našeg rada.%sKlikni u kutiju 'Pošalji povratne informacije'."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Klikni na donji okvir za promicanje svoju stanicu na %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Klikni na donji okvir za promicanje svoju stanicu na %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr "%sSourcefabric%s o.p.s. Airtime se distribuira pod %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime se distribuira pod %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Dobrodošli! Možete se prijaviti koristeći panel za prijavu. Dovoljno je "
-#~ "samo uneti korisničko ime i lozinku: 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Dobrodošli! Možete se prijaviti koristeći panel za prijavu. Dovoljno je samo "
+"uneti korisničko ime i lozinku: 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Kupnja svoj primjerak medijskog prostora"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Kupnja svoj primjerak medijskog prostora"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Ne možeš promijeniti veličinu jednoj emisiji u prošlosti"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Ne možeš promijeniti veličinu jednoj emisiji u prošlosti"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Ne bi bilo slobodno da se emisije preklapaju"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Ne bi bilo slobodno da se emisije preklapaju"
diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
index 356adb5f9..b3e3d675d 100644
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Live stream"
 
@@ -181,6 +182,7 @@ msgstr "Password"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Genere"
 
@@ -321,6 +323,8 @@ msgstr "Sito web:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Lingua:"
 
@@ -343,6 +347,10 @@ msgstr "Lingua:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Salva"
 
@@ -360,6 +368,9 @@ msgstr "Cancella"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Username:"
 
@@ -367,22 +378,31 @@ msgstr "Username:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Password:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Nome:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Cognome:"
 
@@ -391,55 +411,70 @@ msgstr "Cognome:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Cellulare:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "tipo di utente:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Ospite"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Programma direttore"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Amministratore "
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Il nome utente esiste già ."
 
@@ -532,10 +567,12 @@ msgstr "Dj:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Accedi"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Digita le parole del riquadro."
 
@@ -886,6 +923,7 @@ msgstr "Seleziona criteri"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Compositore"
 
@@ -915,6 +955,7 @@ msgstr "Compositore"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Conduttore"
 
@@ -924,6 +965,8 @@ msgstr "Conduttore"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -935,6 +978,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Creatore"
 
@@ -950,6 +996,7 @@ msgstr "Codificato da"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Etichetta"
 
@@ -966,6 +1014,7 @@ msgstr "Etichetta"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Lingua"
 
@@ -990,6 +1039,8 @@ msgstr "Ultima esecuzione"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Lunghezza"
 
@@ -1005,6 +1056,7 @@ msgstr "Formato (Mime)"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Genere (Mood)"
 
@@ -1035,6 +1087,9 @@ msgstr "Velocità campione (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Titolo"
 
@@ -1064,6 +1119,7 @@ msgstr "Sito web"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Anno"
 
@@ -1326,6 +1382,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Autorizzo il trattamento dei miei dati personali."
 
@@ -1336,11 +1394,13 @@ msgstr "Il calore richiesto non può rimanere vuoto"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1517,6 +1577,12 @@ msgstr "Non ci può essere una durata superiore a 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Non puoi sovrascrivere gli show"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "Indirizzo e-mail"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1744,6 +1812,7 @@ msgstr "Valori non validi."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Inserisca per favore il suo nome utente e password"
 
@@ -1754,6 +1823,7 @@ msgstr "Nome utente o  password forniti errati. Per favore riprovi."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1763,6 +1833,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "E-mail inserita non trovata."
 
@@ -1781,16 +1852,19 @@ msgstr "Scarica"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "User aggiunto con successo!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "User aggiornato con successo!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr ""
 
@@ -1963,6 +2037,7 @@ msgstr "Caricamento..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Tutto"
 
@@ -2736,6 +2811,8 @@ msgstr "Apri biblioteca per aggiungere o rimuovere contenuto"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Aggiungi/Rimuovi contenuto"
 
@@ -3162,6 +3239,7 @@ msgstr "Playlist sconosciuta"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Non è permesso l'accesso  alla risorsa."
 
@@ -3176,6 +3254,10 @@ msgstr "Non è permesso l'accesso  alla risorsa."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Non è permesso l'accesso alla risorsa."
 
@@ -3191,11 +3273,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Richiesta errata.  'modalità ' parametro non riuscito."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Richiesta errata. 'modalità ' parametro non valido"
 
@@ -3234,6 +3320,9 @@ msgstr "Aggiungi al blocco intelligente"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Cancella"
 
@@ -3247,6 +3336,7 @@ msgstr ""
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Edita"
 
@@ -3327,16 +3417,19 @@ msgstr "Support Feedback"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Aggiornamento impostazioni Stream."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "il percorso deve essere specificato"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problemi con Liquidsoap..."
 
@@ -3515,6 +3608,8 @@ msgstr "Mostra connessioni alla fonte URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Richiesto)"
 
@@ -3542,26 +3637,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(per scopi di verifica, non ci saranno pubblicazioni)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Note: La lunghezze superiori a 600x600 saranno ridimensionate."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Mostra cosa sto inviando"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Termini e condizioni"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Reimposta password"
 
@@ -3590,6 +3695,7 @@ msgid "Remove watched directory"
 msgstr "Rimuovi elenco visionato"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Sta guardando i cataloghi media."
 
@@ -3769,14 +3875,17 @@ msgid "Stream Settings"
 msgstr "Impostazioni Stream"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Setting globale"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Impostazioni Output Stream"
 
@@ -3894,14 +4003,17 @@ msgid "Limit to "
 msgstr "Limiti"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3958,6 +4070,7 @@ msgid "Then you're good to go!"
 msgstr "Può andare!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Per aiuto dettagliato, legga %suser manual%s."
@@ -4260,6 +4373,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Ritrasmetti da %s a %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Seleziona paese"
 
@@ -4370,6 +4485,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Il programma che sta visionando è fuori data!"
 
@@ -4404,6 +4521,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Il File selezionato non esiste!"
 
@@ -4470,71 +4589,94 @@ msgstr "Vedi file registrati Metadata"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Contenuto show"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Rimuovi il contenuto"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancella show attuale"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Edita show"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Cancella esempio"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Cancella esempio e tutto il seguito"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Non puoi spostare show ripetuti"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Non puoi spostare uno show passato"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Non puoi spostare uno show nel passato"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Non puoi spostare uno show registrato meno di un'ora prima che sia "
 "ritrasmesso."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Lo show è stato cancellato perché lo show registrato non esiste!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Devi aspettare un'ora prima di ritrasmettere."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Riprodotti"
 
@@ -4562,6 +4704,7 @@ msgid "No Records"
 msgstr "No registrazione"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4569,6 +4712,7 @@ msgstr ""
 "abilitato)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Trattamento dati Sourcefabric"
 
@@ -4665,112 +4809,145 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promuovi la mia stazione su Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promuovi la mia stazione su Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Spuntando questo box, acconsento il trattamento dei miei dati personali "
-#~ "attraverso la %sprivacy policy%s di Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Spuntando questo box, acconsento il trattamento dei miei dati personali "
+"attraverso la %sprivacy policy%s di Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Usa autenticazione Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Usa autenticazione Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Il file non esiste in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Il file non esiste in Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Il file non esiste in Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Il file non esiste in Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Il file non esiste in Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Il file non esiste in Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Versione Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Versione Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Aiuti Airtime a migliorare facendoci sapere come lo sta usando. Questa "
-#~ "informazione sarà raccolta regolarmente per  migliorare.%sClicchi 'Si, "
-#~ "aiuta Airtime e noi ci assicureremo che i servizi da lei usati  "
-#~ "migliorino."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Aiuti Airtime a migliorare facendoci sapere come lo sta usando. Questa "
+"informazione sarà raccolta regolarmente per  migliorare.%sClicchi 'Si, "
+"aiuta Airtime e noi ci assicureremo che i servizi da lei usati  migliorino."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Clicchi sotto per pubblicare la sua stazione su %sSourcefabric.org%s. Per "
-#~ "promuovere la sua stazione, 'Spedisca aderenza feedback' deve essere "
-#~ "abilitato. Questi dati saranno raccolti."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Clicchi sotto per pubblicare la sua stazione su %sSourcefabric.org%s. Per "
+"promuovere la sua stazione, 'Spedisca aderenza feedback' deve essere "
+"abilitato. Questi dati saranno raccolti."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Ripeti elenco visionato (Questo è utile se c'è da eseguire montaggio di "
-#~ "rete e può essere fuori  sincronizzazione con Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Ripeti elenco visionato (Questo è utile se c'è da eseguire montaggio di "
+"rete e può essere fuori  sincronizzazione con Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Benvenuti in Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Benvenuti in Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Può cominciato ad usare tAirtime per automatizzare le sue trasmissioni:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Può cominciato ad usare tAirtime per automatizzare le sue trasmissioni:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, il software di radio aperto per elencare e gestione di "
-#~ "stazione remota. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, il software di radio aperto per elencare e gestione di "
+"stazione remota. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Reimposta la password di Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Reimposta la password di Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s.Tutti i diritti riservati."
-#~ "%sMantenuto e distribuito sotto GNU GPL v.3 da %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s.Tutti i diritti riservati."
+"%sMantenuto e distribuito sotto GNU GPL v.3 da %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Aiuti Airtime a migliorare facendo sapere a  Sourcefabric come lo sta "
-#~ "usandolo. Queste informazioni saranno raccolte regolarmente per "
-#~ "migliorare. %s Clicchi su 'Spedisca aderenza feedback'e noi ci "
-#~ "assicureremo che i servizi da lei usati  stanno migliorando."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Aiuti Airtime a migliorare facendo sapere a  Sourcefabric come lo sta "
+"usandolo. Queste informazioni saranno raccolte regolarmente per migliorare. "
+"%s Clicchi su 'Spedisca aderenza feedback'e noi ci assicureremo che i "
+"servizi da lei usati  stanno migliorando."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Clicchi sotto per promuovere la sua Stazione su %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "Clicchi sotto per promuovere la sua Stazione su %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr "%sSourcefabric%s o.p.s. Airtime è distribuito da %sGNU GPL v.%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime è distribuito da %sGNU GPL v.%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Benvenuti al demo online Airtime! Può accedere usando l'username "
-#~ "'consenti' e la password 'consenti'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Benvenuti al demo online Airtime! Può accedere usando l'username 'consenti' "
+"e la password 'consenti'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Acquisti la sua copia Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Acquisti la sua copia Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Non puoi ridimensionare uno show passato"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Non puoi ridimensionare uno show passato"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Non si devono sovrapporre gli show"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Non si devono sovrapporre gli show"
diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
index adb3b100d..d292f148d 100644
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
@@ -100,6 +100,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "라이브 스트림"
 
@@ -180,6 +181,7 @@ msgstr "암호"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "장르"
 
@@ -320,6 +322,8 @@ msgstr "웹사이트"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "언어"
 
@@ -342,6 +346,10 @@ msgstr "언어"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "저장"
 
@@ -359,6 +367,9 @@ msgstr "취소"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "아이디: "
 
@@ -366,22 +377,31 @@ msgstr "아이디: "
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "암호: "
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "암호 확인:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "이름:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "성:"
 
@@ -390,55 +410,70 @@ msgstr "성:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "이메일"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "휴대전화:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "스카입:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "유저 타입"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "손님"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "프로그램 매니저"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "관리자"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "사용할수 없는 아이디 입니다"
 
@@ -531,10 +566,12 @@ msgstr "DJ들:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "로그인"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "밑에 보이는 그림에 나온 문자를 입력하세요"
 
@@ -885,6 +922,7 @@ msgstr "기준 선택"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "앨범"
 
@@ -906,6 +944,8 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "작곡가"
 
@@ -914,6 +954,7 @@ msgstr "작곡가"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "지휘자"
 
@@ -923,6 +964,8 @@ msgstr "지휘자"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "저작권"
 
@@ -934,6 +977,9 @@ msgstr "저작권"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "제작자"
 
@@ -949,6 +995,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr ""
 
@@ -957,6 +1004,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "레이블"
 
@@ -965,6 +1013,7 @@ msgstr "레이블"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "언어"
 
@@ -989,6 +1038,8 @@ msgstr "마지막 방송일"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "길이"
 
@@ -1004,6 +1055,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "무드"
 
@@ -1034,6 +1086,9 @@ msgstr "샘플 레이트"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "제목"
 
@@ -1063,6 +1118,7 @@ msgstr "웹싸이트"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "년도"
 
@@ -1326,6 +1382,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "사용자 약관에 동의 하십시오"
 
@@ -1336,11 +1394,13 @@ msgstr "이 필드는 비워둘수 없습니다."
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1515,6 +1575,12 @@ msgstr "쇼의 길이가 24h를 넘을수 없습니다"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "쇼를 중복되게 스케쥴할수 없습니다"
 
@@ -1689,6 +1755,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1723,6 +1790,7 @@ msgid "Email Address"
 msgstr "이메일 주소"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr "시스템->스트림 에서 관리자 아이디/암호를 다시 확인하세요."
@@ -1742,6 +1810,7 @@ msgstr "잘못된 값입니다"
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "아이디와 암호를 입력해주세요"
 
@@ -1752,6 +1821,7 @@ msgstr "아이디와 암호가 맞지 않습니다. 다시 시도해주세요"
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1759,6 +1829,7 @@ msgstr "이메일을 전송 할수 없습니다. 메일 서버 세팅을 다시
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "이메일을 찾을수 없습니다"
 
@@ -1777,16 +1848,19 @@ msgstr "다운로드"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "사용자가 추가 되었습니다!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "사용자 정보가 업데이트 되었습니다!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "세팅이 성공적으로 업데이트 되었습니다!"
 
@@ -1957,6 +2031,7 @@ msgstr "로딩..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "전체"
 
@@ -2721,6 +2796,8 @@ msgstr "라이브러리 열기"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "내용 추가/제거"
 
@@ -3151,6 +3228,7 @@ msgstr "모르는 재생목록"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "권한이 부족합니다"
 
@@ -3165,6 +3243,10 @@ msgstr "권한이 부족합니다"
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "권한이 부족합니다"
 
@@ -3180,11 +3262,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr ""
 
@@ -3223,6 +3309,9 @@ msgstr "스마트 블록에 추가"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "삭제"
 
@@ -3236,6 +3325,7 @@ msgstr "중복된 플레이 리스트"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "수정"
 
@@ -3316,16 +3406,19 @@ msgstr "사용자 피드백"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "스트림 설정이 업데이트 되었습니다"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "경로를 입력해주세요"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Liquidsoap 문제..."
 
@@ -3504,6 +3597,8 @@ msgstr "쇼 소스 접속 URL:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(*)"
 
@@ -3531,26 +3626,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(확인을 위한것입니다, 이 정보는 어디에도 게시 되지 않습니다)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "주의: 600*600보다 큰 이미지는 사이즈가 수정 됩니다"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "보내지는 데이타 보기"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "사용자 약관"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "암호 초기화"
 
@@ -3579,6 +3684,7 @@ msgid "Remove watched directory"
 msgstr "모니터중인 폴더를 리스트에서 삭제"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "모니터중인 폴더가 없습니다"
 
@@ -3756,14 +3862,17 @@ msgid "Stream Settings"
 msgstr "락스트림 설정"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "전역 설정"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "출력 스트림 설정"
 
@@ -3881,14 +3990,17 @@ msgid "Limit to "
 msgstr "길이 제한 "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3942,6 +4054,7 @@ msgid "Then you're good to go!"
 msgstr "첫 번째 쇼를 성공적으로 생성 하였습니다."
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "더 자세한 도움을 원하시면,  메뉴얼을 참고 하여 주세요. %suser manual%s"
@@ -4244,6 +4357,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "%s 재방송( %s에 시작) "
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "국가 선택"
 
@@ -4348,6 +4463,8 @@ msgstr "현재 보고 계신 스케쥴이 맞지 않습니다(instance mismatch)
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "현재 보고 계신 스케쥴이 맞지 않습니다"
 
@@ -4382,6 +4499,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "선택하신 파일이 존재 하지 않습니다"
 
@@ -4446,69 +4565,92 @@ msgstr "녹음된 파일의 메타데이타 보기"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "쇼 내용 보기"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "내용 모두 삭제"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "현재 쇼 취소"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "쇼 수정"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "이 인스턴스 삭제"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "이 인스턴스와 이후에 모든 인스턴스 삭제"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "권한이 부족합니다"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "반복쇼는 드래그 앤 드롭 할수 없습니다"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "지난 쇼는 이동할수 없습니다"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "과거로 쇼를 이동할수 없습니다"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "녹화 쇼를 재방송 시작 1시간 안으로 이동할수 없습니다"
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "녹화 쇼가 없으로 쇼가 삭제 되었습니다"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "녹화 쇼와 재방송 사이에는 1시간의 간격이 필요합니다 "
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "방송됨"
 
@@ -4536,11 +4678,13 @@ msgid "No Records"
 msgstr "레코드 없음"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr "(체크 하기 위해선 '피드백 보내기'를 체크 하셔야 합니다)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric 이용 약관"
 
@@ -4636,86 +4780,134 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "내 방송국을 Sourcefabric.org에 홍보"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "내 방송국을 Sourcefabric.org에 홍보"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "이 박스에 체크함으로, Sourcefabric's %sprivacy policy%s에 동의합니다."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "이 박스에 체크함으로, Sourcefabric's %sprivacy policy%s에 동의합니다."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Airtime 인증 사용"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Airtime 인증 사용"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "파일이 존재 하지 않습니다"
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "파일이 존재 하지 않습니다"
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "파일이 존재 하지 않습니다"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "파일이 존재 하지 않습니다"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "파일이 존재 하지 않습니다"
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "파일이 존재 하지 않습니다"
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime 버전"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime 버전"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Airtime 사용자들 께서 피드백을 보내주시면, 그걸 기본으로 사용자들이 원하"
-#~ "는 방향으로 나아가는Airtime이 되겠습니다.  %s'Airtime 도와주기' 클릭하여 "
-#~ "피드백을 보내주세요"
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Airtime 사용자들 께서 피드백을 보내주시면, 그걸 기본으로 사용자들이 원하는 방"
+"향으로 나아가는Airtime이 되겠습니다.  %s'Airtime 도와주기' 클릭하여 피드백을 "
+"보내주세요"
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "%sSourcefabric.org%s에 방송국을 홍보 하시려면 체크 하세요. 체크 하기 위해"
-#~ "선 '피드백 보내기'를 체크 하셔야 합니다"
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"%sSourcefabric.org%s에 방송국을 홍보 하시려면 체크 하세요. 체크 하기 위해선 "
+"'피드백 보내기'를 체크 하셔야 합니다"
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "모니터중인 폴더 다시 검색(네트워크 드라이브를 모니터중일떄, Airtime과  동"
-#~ "기화 실패시 사용)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"모니터중인 폴더 다시 검색(네트워크 드라이브를 모니터중일떄, Airtime과  동기"
+"화 실패시 사용)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Airtime에 오신걸 환영합니다"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Airtime에 오신걸 환영합니다"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr "Airtime을 이용하여 방송을 자동화 할수 있는 기본 가이드 입니다:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr "Airtime을 이용하여 방송을 자동화 할수 있는 기본 가이드 입니다:"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime 암호 초기화"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime 암호 초기화"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Airtime 사용자들 께서 피드백을 보내주시면, 그걸 기본으로 사용자들이 원하"
-#~ "는 방향으로 나아가는Airtime이 되겠습니다.  %s'Airtime 도와주기' 클릭하여 "
-#~ "피드백을 보내주세요"
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Airtime 사용자들 께서 피드백을 보내주시면, 그걸 기본으로 사용자들이 원하는 방"
+"향으로 나아가는Airtime이 되겠습니다.  %s'Airtime 도와주기' 클릭하여 피드백을 "
+"보내주세요"
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr "%sSourcefabric.org%s에 방송국을 홍보 하시려면 체크 하세요."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "%sSourcefabric.org%s에 방송국을 홍보 하시려면 체크 하세요."
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr "Airtime 데모에 오신건 환영합니다! admin/admin으로 로그인 하십시오."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr "Airtime 데모에 오신건 환영합니다! admin/admin으로 로그인 하십시오."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Airtime을 구입하세요"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Airtime을 구입하세요"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "지난 쇼는 사이즈를 조정할수 없습니다 "
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "지난 쇼는 사이즈를 조정할수 없습니다 "
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "중복 스케쥴을 할수 없스니다"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "중복 스케쥴을 할수 없스니다"
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
index ec2a4c153..8d6bc8fe0 100644
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
@@ -100,6 +100,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr ""
 
@@ -180,6 +181,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr ""
 
@@ -320,6 +322,8 @@ msgstr ""
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr ""
 
@@ -342,6 +346,10 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr ""
 
@@ -359,6 +367,9 @@ msgstr ""
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr ""
 
@@ -366,22 +377,31 @@ msgstr ""
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr ""
 
@@ -390,55 +410,70 @@ msgstr ""
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr ""
 
@@ -531,10 +566,12 @@ msgstr ""
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr ""
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr ""
 
@@ -883,6 +920,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr ""
 
@@ -904,6 +942,8 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr ""
 
@@ -912,6 +952,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr ""
 
@@ -921,6 +962,8 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr ""
 
@@ -932,6 +975,9 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr ""
 
@@ -947,6 +993,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr ""
 
@@ -955,6 +1002,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr ""
 
@@ -963,6 +1011,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr ""
 
@@ -987,6 +1036,8 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr ""
 
@@ -1002,6 +1053,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr ""
 
@@ -1032,6 +1084,9 @@ msgstr ""
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr ""
 
@@ -1061,6 +1116,7 @@ msgstr ""
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr ""
 
@@ -1322,6 +1378,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr ""
 
@@ -1332,11 +1390,13 @@ msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1511,6 +1571,12 @@ msgstr ""
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr ""
 
@@ -1685,6 +1751,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1719,6 +1786,7 @@ msgid "Email Address"
 msgstr ""
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1738,6 +1806,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr ""
 
@@ -1748,6 +1817,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1755,6 +1825,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr ""
 
@@ -1773,16 +1844,19 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr ""
 
@@ -1953,6 +2027,7 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr ""
 
@@ -2677,6 +2752,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr ""
 
@@ -3103,6 +3180,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr ""
 
@@ -3117,6 +3195,10 @@ msgstr ""
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr ""
 
@@ -3132,11 +3214,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr ""
 
@@ -3175,6 +3261,9 @@ msgstr ""
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr ""
 
@@ -3188,6 +3277,7 @@ msgstr ""
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr ""
 
@@ -3268,16 +3358,19 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr ""
 
@@ -3456,6 +3549,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr ""
 
@@ -3483,26 +3578,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr ""
 
@@ -3531,6 +3636,7 @@ msgid "Remove watched directory"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr ""
 
@@ -3708,14 +3814,17 @@ msgid "Stream Settings"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr ""
 
@@ -3831,14 +3940,17 @@ msgid "Limit to "
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3886,6 +3998,7 @@ msgid "Then you're good to go!"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr ""
@@ -4186,6 +4299,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr ""
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr ""
 
@@ -4290,6 +4405,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr ""
 
@@ -4324,6 +4441,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr ""
 
@@ -4384,69 +4503,92 @@ msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr ""
 
@@ -4530,11 +4672,13 @@ msgid ""
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr ""
 
@@ -4569,3 +4713,125 @@ msgid ""
 "does not have enough disk space or the stor directory does not have correct "
 "write permissions."
 msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr ""
+
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr ""
+
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr ""
+
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr ""
+
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr ""
+
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr ""
diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
index 2c8ebf357..b5275be98 100644
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Transmisja na żywo"
 
@@ -181,6 +182,7 @@ msgstr "Hasło"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Gatunek"
 
@@ -321,6 +323,8 @@ msgstr "Strona internetowa:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Język:"
 
@@ -343,6 +347,10 @@ msgstr "Język:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Zapisz"
 
@@ -360,6 +368,9 @@ msgstr "Anuluj"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
@@ -367,22 +378,31 @@ msgstr "Nazwa użytkownika:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Hasło:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Potwierdź hasło:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Imię:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Nazwisko:"
 
@@ -391,55 +411,70 @@ msgstr "Nazwisko:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Telefon:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Typ użytkownika:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Gość"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "Prowadzący"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Menedżer programowy"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Administrator"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Nazwa użytkownika musi być unikalna."
 
@@ -532,10 +567,12 @@ msgstr "Prowadzący:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Zaloguj"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Wpisz znaki, które widzisz na obrazku poniżej."
 
@@ -886,6 +923,7 @@ msgstr "Wybierz kryteria"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Kompozytor"
 
@@ -915,6 +955,7 @@ msgstr "Kompozytor"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Dyrygent/Pod batutą"
 
@@ -924,6 +965,8 @@ msgstr "Dyrygent/Pod batutą"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
@@ -935,6 +978,9 @@ msgstr "Prawa autorskie"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Twórca"
 
@@ -950,6 +996,7 @@ msgstr "Kodowane przez"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Wydawnictwo"
 
@@ -966,6 +1014,7 @@ msgstr "Wydawnictwo"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Język"
 
@@ -990,6 +1039,8 @@ msgstr "Ostatnio odtwarzany"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Długość"
 
@@ -1005,6 +1056,7 @@ msgstr "Podobne do"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Nastrój"
 
@@ -1035,6 +1087,9 @@ msgstr "Częstotliwość próbkowania (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1064,6 +1119,7 @@ msgstr "Strona internetowa"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Rok"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Wymagana jest akceptacja polityki prywatności."
 
@@ -1337,11 +1395,13 @@ msgstr "Pole jest wymagane i nie może być puste"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1518,6 +1578,12 @@ msgstr "Czas trwania nie może być dłuższy niż 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Nie można planować nakładających się audycji"
 
@@ -1692,6 +1758,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Uznanie a Na Tych Samych Warunkach  wg Creative Commons "
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1726,6 +1793,7 @@ msgid "Email Address"
 msgstr "Adres Email"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Nieprawidłowe wartości formularzy"
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Proszę wpisać nazwę użytkownika i hasło"
 
@@ -1756,6 +1825,7 @@ msgstr "Błędna nazwa użytkownika lub hasło. Spróbuj ponownie."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1765,6 +1835,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Podany adres email nie został odnaleziony."
 
@@ -1783,16 +1854,19 @@ msgstr "Pobierz"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Użytkownik został dodany poprawnie!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Użytkownik został poprawnie zaktualizowany!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Ustawienia zostały poprawnie zaktualizowane!"
 
@@ -1964,6 +2038,7 @@ msgstr "Ładowanie"
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Wszystko"
 
@@ -2737,6 +2812,8 @@ msgstr "Otwóz bibliotekę w celu dodania bądź usunięcia zawartości"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Dodaj/usuń zawartość"
 
@@ -3165,6 +3242,7 @@ msgstr "Nieznana playlista"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Nie masz dostępu do tej lokalizacji"
 
@@ -3179,6 +3257,10 @@ msgstr "Nie masz dostępu do tej lokalizacji"
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Nie masz dostępu do tej lokalizacji."
 
@@ -3194,11 +3276,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Złe zapytanie. Nie zaakceprtowano parametru 'mode'"
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Złe zapytanie. Parametr 'mode' jest nieprawidłowy"
 
@@ -3237,6 +3323,9 @@ msgstr "Dodaj do smartblocku"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Usuń"
 
@@ -3250,6 +3339,7 @@ msgstr "Skopiuj listę odtwarzania"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Edytuj"
 
@@ -3330,16 +3420,19 @@ msgstr "Informacja zwrotna"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Zaktualizowano ustawienia strumienia"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "należy okreslić ścieżkę"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem z Liquidsoap..."
 
@@ -3518,6 +3611,8 @@ msgstr "Adres URL połączenia dla Żródła audycji"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Wymagane)"
 
@@ -3545,27 +3640,37 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(tylko dla celów weryfikacji, dane nie będą rozpowszechniane)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr ""
 "Uwaga: każdy plik o rozmiarze większym niż 600x600 zostanie zmniejszony"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Pokazuj, co wysyłam"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Zasady i warunki"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Resetuj hasło"
 
@@ -3594,6 +3699,7 @@ msgid "Remove watched directory"
 msgstr "Usuń obserwowany katalog."
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Nie obserwujesz w tej chwili żadnych folderów"
 
@@ -3771,14 +3877,17 @@ msgid "Stream Settings"
 msgstr "Ustawienia strumienia"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Ustawienia ogólne"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Ustawienia strumienia wyjściowego"
 
@@ -3896,14 +4005,17 @@ msgid "Limit to "
 msgstr "Ogranicz(enie) do:"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3960,6 +4072,7 @@ msgid "Then you're good to go!"
 msgstr "Gotowe!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "W celu uzyskania szczegółowej pomocy, skorzystaj z %suser manual%s"
@@ -4262,6 +4375,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Retransmisja z %s do %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Wybierz kraj"
 
@@ -4375,6 +4490,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Harmonogram, który przeglądasz jest nieaktualny!"
 
@@ -4410,6 +4527,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Wybrany plik nie istnieje!"
 
@@ -4475,71 +4594,94 @@ msgstr "Przeglądaj metadane nagrania"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Zawartość audycji"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Usuń całą zawartość"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Skasuj obecną audycję"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Edytuj audycję"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Usuń tą instancję"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Usuń ten i wszystkie inne instancje"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Nie można użyć metody 'przeciągnij i upuść' dla powtórek audycji."
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Nie można przenieść audycji archiwalnej"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Nie można przenieść audycji w przeszłość"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Nagrywana audycja nie może zostać przeniesiona na mniej niż 1h przed jej "
 "powtórką."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Audycja została usunięta, ponieważ nagranie nie istnieje!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Należy odczekać 1 godzinę przed ponownym odtworzeniem."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Odtwarzane"
 
@@ -4567,6 +4709,7 @@ msgid "No Records"
 msgstr "Brak danych"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4574,6 +4717,7 @@ msgstr ""
 "\")"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Polityka prywatności Sourcefabric"
 
@@ -4672,118 +4816,150 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promuj moją stację na Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promuj moją stację na Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Zanaczając to pole, akceptujesz %spolitykę prywatności%s Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "Zanaczając to pole, akceptujesz %spolitykę prywatności%s Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Zastosuj uwierzytelnienie Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Zastosuj uwierzytelnienie Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Plik nie istnieje w Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Plik nie istnieje w Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Plik nie istnieje w Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Plik nie istnieje w Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Plik nie istnieje w Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Plik nie istnieje w Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Wersja Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Wersja Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "W celu udoskonalenia programu Airtime, prosimy o przesłanie informacji "
-#~ "zwrotnej o sposobie uzytkowania. Informacje takie będą zbierane "
-#~ "regualrnie w celu poprawienia jakości uzytkowania. %s Kliknij \"Tak, chcę "
-#~ "wesprzeć Airtime\", dołożymy starań, by funkcje, których używasz, były "
-#~ "stale ulepszane."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"W celu udoskonalenia programu Airtime, prosimy o przesłanie informacji "
+"zwrotnej o sposobie uzytkowania. Informacje takie będą zbierane regualrnie w "
+"celu poprawienia jakości uzytkowania. %s Kliknij \"Tak, chcę wesprzeć Airtime"
+"\", dołożymy starań, by funkcje, których używasz, były stale ulepszane."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Kliknij w poniższe pole w celu umieszczenia reklamy twojej radiostacji na "
-#~ "%s Sourfabric.org%s. Należy przy tym udostępnić opcję 'Wyślij informację "
-#~ "zwrotną'. Informacje te będą pozyskiwane razem z informacją zwrotną."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Kliknij w poniższe pole w celu umieszczenia reklamy twojej radiostacji na %s "
+"Sourfabric.org%s. Należy przy tym udostępnić opcję 'Wyślij informację "
+"zwrotną'. Informacje te będą pozyskiwane razem z informacją zwrotną."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Przeskanuj ponownie obserwowany katalog (Przydatne w przypadku "
-#~ "rozsynchronizowanego dysku sieciowego)."
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Przeskanuj ponownie obserwowany katalog (Przydatne w przypadku "
+"rozsynchronizowanego dysku sieciowego)."
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Witamy w Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Witamy w Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Dowiedz się jak rozpocząć użytkowanie Airtime'a, aby zautomatyzować "
-#~ "transmisje radiowe:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Dowiedz się jak rozpocząć użytkowanie Airtime'a, aby zautomatyzować "
+"transmisje radiowe:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s otwarte oprogramowanie radiowe do planowania i zdalnego "
-#~ "zarządzania stacją. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s otwarte oprogramowanie radiowe do planowania i zdalnego "
+"zarządzania stacją. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Resetowanie hasła Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Resetowanie hasła Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. Wszelkie prawa zastrzeżone."
-#~ "%sUżytkowany i udostępniany na podstawie licencji GNU GPL v.3 by "
-#~ "%sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. Wszelkie prawa zastrzeżone."
+"%sUżytkowany i udostępniany na podstawie licencji GNU GPL v.3 by "
+"%sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "W celu udoskonalenia programu Airtime, prosimy o przesłanie informacji "
-#~ "zwrotnej o sposobie uzytkowania. Informacje takie będą zbierane "
-#~ "regualrnie w celu poprawienia jakości uzytkowania. %s Kliknij \"Tak, chcę "
-#~ "wesprzeć Airtime\", dołożymy starań, by funkcje, których używasz, były "
-#~ "stale ulepszane."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"W celu udoskonalenia programu Airtime, prosimy o przesłanie informacji "
+"zwrotnej o sposobie uzytkowania. Informacje takie będą zbierane regualrnie w "
+"celu poprawienia jakości uzytkowania. %s Kliknij \"Tak, chcę wesprzeć Airtime"
+"\", dołożymy starań, by funkcje, których używasz, były stale ulepszane."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Kliknij w poniższe pole w celu zareklamowania swojej stacji na "
-#~ "%sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Kliknij w poniższe pole w celu zareklamowania swojej stacji na "
+"%sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime jest rozpowszechniany na podstawie %sGNU "
-#~ "GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime jest rozpowszechniany na podstawie %sGNU GPL "
+"v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Witamy w  internetowej wersji demonstracyjnej programu Airtime. Możesz "
-#~ "się zalogować, wpisując login 'admin' oraz hasło 'admin'"
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Witamy w  internetowej wersji demonstracyjnej programu Airtime. Możesz się "
+"zalogować, wpisując login 'admin' oraz hasło 'admin'"
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Zakup kopię Airtime'a"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Zakup kopię Airtime'a"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "nie można zmienić rozmiaru przeszłej audycji"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "nie można zmienić rozmiaru przeszłej audycji"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Audycje nie powinny nakładać się."
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Audycje nie powinny nakładać się."
diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
index 92e0cc0f2..2545bb6d1 100644
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
@@ -100,6 +100,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Fluxo ao vivo"
 
@@ -180,6 +181,7 @@ msgstr "Senha"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Gênero"
 
@@ -320,6 +322,8 @@ msgstr "Website:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Idioma:"
 
@@ -342,6 +346,10 @@ msgstr "Idioma:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Salvar"
 
@@ -359,6 +367,9 @@ msgstr "Cancelar"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Usuário:"
 
@@ -366,22 +377,31 @@ msgstr "Usuário:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Senha:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Confirmar Senha:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Primeiro nome:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Último nome:"
 
@@ -390,55 +410,70 @@ msgstr "Último nome:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Celular:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Perfil do Usuário:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Visitante"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "DJ"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Gerente de Programação"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Administrador"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Usuário já existe."
 
@@ -531,10 +566,12 @@ msgstr "DJs:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Acessar"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Digite os caracteres que você vê na imagem abaixo."
 
@@ -885,6 +922,7 @@ msgstr "Selecione um critério"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Álbum"
 
@@ -906,6 +944,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Compositor"
 
@@ -914,6 +954,7 @@ msgstr "Compositor"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Maestro"
 
@@ -923,6 +964,8 @@ msgstr "Maestro"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Copyright"
 
@@ -934,6 +977,9 @@ msgstr "Copyright"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Criador"
 
@@ -949,6 +995,7 @@ msgstr "Convertido por"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -957,6 +1004,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Legenda"
 
@@ -965,6 +1013,7 @@ msgstr "Legenda"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Idioma"
 
@@ -989,6 +1038,8 @@ msgstr "Última Execução"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Duração"
 
@@ -1004,6 +1055,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Humor"
 
@@ -1034,6 +1086,9 @@ msgstr "Taxa de Amostragem (khz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Título"
 
@@ -1063,6 +1118,7 @@ msgstr "Website"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Ano"
 
@@ -1326,6 +1382,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Você precisa concordar com a política de privacidade."
 
@@ -1336,11 +1394,13 @@ msgstr "Valor é obrigatório e não poder estar em branco."
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr ""
 
@@ -1515,6 +1575,12 @@ msgstr "Não pode ter duração maior que 24 horas"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Não é permitido agendar programas sobrepostos"
 
@@ -1689,6 +1755,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution Noncommercial Share Alike"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1723,6 +1790,7 @@ msgid "Email Address"
 msgstr "Endereço de Email"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1744,6 +1812,7 @@ msgstr "Valores do formulário inválidos."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Por favor informe seu usuário e senha"
 
@@ -1754,6 +1823,7 @@ msgstr "Usuário ou senha inválidos. Tente novamente."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1763,6 +1833,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "O email informado não foi localizado."
 
@@ -1781,16 +1852,19 @@ msgstr "Download"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Usuário adicionado com sucesso!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Usuário atualizado com sucesso!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Configurações atualizadas com sucesso!"
 
@@ -1962,6 +2036,7 @@ msgstr "Carregando..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Todos"
 
@@ -2738,6 +2813,8 @@ msgstr "Abrir biblioteca para adicionar ou remover conteúdo"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Adicionar / Remover Conteúdo"
 
@@ -3166,6 +3243,7 @@ msgstr "Lista Desconhecida"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Você não tem permissão para acessar esta funcionalidade."
 
@@ -3180,6 +3258,10 @@ msgstr "Você não tem permissão para acessar esta funcionalidade."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Você não tem permissão para acessar esta funcionalidade."
 
@@ -3195,11 +3277,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Requisição inválida. Parâmetro não informado."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Requisição inválida. Parâmetro informado é inválido."
 
@@ -3238,6 +3324,9 @@ msgstr "Adicionar ao Bloco"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Excluir"
 
@@ -3251,6 +3340,7 @@ msgstr "Duplicar Lista"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Editar"
 
@@ -3332,16 +3422,19 @@ msgstr "Informações de Suporte"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Preferências de fluxo atualizadas."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "o caminho precisa ser informado"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problemas com o Liquidsoap..."
 
@@ -3520,6 +3613,8 @@ msgstr "URL de Conexão da Fonte do Programa:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Obrigatório)"
 
@@ -3547,26 +3642,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(somente para efeito de verificação, não será publicado)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Nota: qualquer arquivo maior que 600x600 será redimensionado"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Mostrar quais informações estou enviando"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Termos e Condições"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Redefinir senha"
 
@@ -3595,6 +3700,7 @@ msgid "Remove watched directory"
 msgstr "Remover diretório monitorado"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Você não está monitorando nenhum diretório."
 
@@ -3773,14 +3879,17 @@ msgid "Stream Settings"
 msgstr "Configurações de Fluxo"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Configurações Globais"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Configurações do Fluxo de Saída"
 
@@ -3898,14 +4007,17 @@ msgid "Limit to "
 msgstr "Limitar em"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3963,6 +4075,7 @@ msgid "Then you're good to go!"
 msgstr "Você já está pronto para começar!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Para obter ajuda mais detalhada, leia o %smanual do usuário%s."
@@ -4265,6 +4378,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Retransmissão de %s a partir de %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Selecione o País"
 
@@ -4377,6 +4492,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "A programação que você está vendo está desatualizada!"
 
@@ -4411,6 +4528,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Um dos arquivos selecionados não existe!"
 
@@ -4478,71 +4597,94 @@ msgstr "Visualizar Metadados do Arquivo Gravado"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Exibir Conteúdo"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Remover Todo o Conteúdo"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Cancelar Programa em Exibição"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Editar Programa"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Excluir esta Instância"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Excluir esta Instância e todas as seguintes"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Não é possível arrastar e soltar programas repetidos"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Não é possível mover um programa anterior"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Não é possível mover um programa anterior"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Não é possível mover um programa gravado menos de 1 hora antes de suas "
 "retransmissões."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "O programa foi excluído porque a gravação prévia não existe!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "É necessário aguardar 1 hora antes de retransmitir."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr ""
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Executado"
 
@@ -4570,6 +4712,7 @@ msgid "No Records"
 msgstr "Não há gravações"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4577,6 +4720,7 @@ msgstr ""
 "precisa estar habilitada)"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Política de Privacidade Sourcefabric"
 
@@ -4675,113 +4819,147 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Divulgue minha estação em Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Divulgue minha estação em Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Clicando nesta caixa, eu concordo com a %spolitica de privacidade%s da "
-#~ "Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Clicando nesta caixa, eu concordo com a %spolitica de privacidade%s da "
+"Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Usar Autenticação do Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Usar Autenticação do Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Arquivo não existe no Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Arquivo não existe no Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Arquivo não existe no Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Arquivo não existe no Airtime."
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Arquivo não existe no Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Arquivo não existe no Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Versão do Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Versão do Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer "
-#~ "como você está usando o produto. Essas informações serão colhidas "
-#~ "regularmente, a fim de melhorar a sua experiência como usuário.%s Clique "
-#~ "na opção \"Enviar Comentário de Apoio\" e nós garantiremos a evolução "
-#~ "contínua das funcionalidade que você utiliza."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como "
+"você está usando o produto. Essas informações serão colhidas regularmente, a "
+"fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar "
+"Comentário de Apoio\" e nós garantiremos a evolução contínua das "
+"funcionalidade que você utiliza."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Verificar novamente diretório monitorado (Isso pode ser útil em caso de "
-#~ "montagem de volume em rede e este estiver fora de sincronia com o Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Verificar novamente diretório monitorado (Isso pode ser útil em caso de "
+"montagem de volume em rede e este estiver fora de sincronia com o Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Benvindo ao Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Benvindo ao Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr "Saiba como utilizar o Airtime para automatizar suas transmissões:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr "Saiba como utilizar o Airtime para automatizar suas transmissões:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, um software livre para automação e gestão remota de "
-#~ "estação de rádio. % s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, um software livre para automação e gestão remota de estação "
+"de rádio. % s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Redefinição de Senha do Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Redefinição de Senha do Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime Copyright  &copy;Sourcefabric o.p.s. Todos od direitos reservados."
-#~ "%sMantido e distribuído sob licença GNU GPL v.3 by %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime Copyright  &copy;Sourcefabric o.p.s. Todos od direitos reservados."
+"%sMantido e distribuído sob licença GNU GPL v.3 by %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer "
-#~ "como você está usando o produto. Essas informações serão colhidas "
-#~ "regularmente, a fim de melhorar a sua experiência como usuário.%s Clique "
-#~ "na opção \"Enviar Comentário de Apoio\" e nós garantiremos a evolução "
-#~ "contínua das funcionalidade que você utiliza."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Colabore com a evolução do Airtime,  permitindo à Sourcefabric conhecer como "
+"você está usando o produto. Essas informações serão colhidas regularmente, a "
+"fim de melhorar a sua experiência como usuário.%s Clique na opção \"Enviar "
+"Comentário de Apoio\" e nós garantiremos a evolução contínua das "
+"funcionalidade que você utiliza."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Clique na oção abaixo para divulgar sua estação em  %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime é distribuído sob a licença %sGNU GPL "
-#~ "v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime é distribuído sob a licença %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Bem-vindo à demonstração online do Airtime! Autentique-se com usuário "
-#~ "'admin' e senha \"admin\"."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Bem-vindo à demonstração online do Airtime! Autentique-se com usuário "
+"'admin' e senha \"admin\"."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Adquira sua cópia do Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Adquira sua cópia do Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "Não é permitido redimensionar um programa anterior"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "Não é permitido redimensionar um programa anterior"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Os programas não devem ser sobrepostos"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Os programas não devem ser sobrepostos"
diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
index c103b175b..60d593157 100644
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
@@ -105,6 +105,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Потоковый режим"
 
@@ -185,6 +186,7 @@ msgstr "Пароль"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Жанр"
 
@@ -325,6 +327,8 @@ msgstr "Вебсайт:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Язык: "
 
@@ -347,6 +351,10 @@ msgstr "Язык: "
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Сохранить"
 
@@ -364,6 +372,9 @@ msgstr "Отменить"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Логин:"
 
@@ -371,22 +382,31 @@ msgstr "Логин:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Пароль:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Повторите пароль:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Имя"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Фамилия"
 
@@ -395,55 +415,70 @@ msgstr "Фамилия"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Email:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Тел:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Тип пользователя:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Гость"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "Диджей"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Менеджер программы"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Администратор"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Имя пользователя не является уникальным."
 
@@ -536,10 +571,12 @@ msgstr "Диджеи:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Войти"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Введите символы, которые вы видите на картинке ниже."
 
@@ -890,6 +927,7 @@ msgstr "Выбрать критерии"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Альбом"
 
@@ -911,6 +949,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Композитор"
 
@@ -919,6 +959,7 @@ msgstr "Композитор"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Исполнитель"
 
@@ -928,6 +969,8 @@ msgstr "Исполнитель"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Авторское право"
 
@@ -939,6 +982,9 @@ msgstr "Авторское право"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Создатель"
 
@@ -954,6 +1000,7 @@ msgstr "Закодировано в"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -962,6 +1009,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Ярлык "
 
@@ -970,6 +1018,7 @@ msgstr "Ярлык "
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Язык"
 
@@ -994,6 +1043,8 @@ msgstr "Последнее проигрывание"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Длина"
 
@@ -1009,6 +1060,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Настроение"
 
@@ -1039,6 +1091,9 @@ msgstr "Частота дискретизации (кГц)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1068,6 +1123,7 @@ msgstr "Вебсайт"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Год"
 
@@ -1331,6 +1387,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Вы должны согласиться с политикой конфиденциальности."
 
@@ -1341,11 +1399,13 @@ msgstr "Значение является обязательным и не мо
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Время старта"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Время окончания"
 
@@ -1522,6 +1582,12 @@ msgstr "Не может иметь длительность более 24 час
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Невозможно поставить в расписание пересекающиеся программы"
 
@@ -1696,6 +1762,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Attribution некоммерческая в равных долях"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Временная зона (броузер)"
 
@@ -1730,6 +1797,7 @@ msgid "Email Address"
 msgstr "Адрес электронной почты"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1749,6 +1817,7 @@ msgstr "Недопустимые значения формы."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Пожалуйста, введите ваше имя пользователя и пароль"
 
@@ -1759,6 +1828,7 @@ msgstr "Неверное имя пользователя или пароль. П
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1768,6 +1838,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "Данный email не найден."
 
@@ -1786,16 +1857,19 @@ msgstr "Загрузить"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Пользователь успешно добавлен!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Пользователь успешно обновлен!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Изменения в настройках сохранены!"
 
@@ -1967,6 +2041,7 @@ msgstr "Загрузка..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Все"
 
@@ -2743,6 +2818,8 @@ msgstr "Открыть библиотеку, чтобы добавить или
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Добавить / удалить содержимое"
 
@@ -3169,6 +3246,7 @@ msgstr "Неизвестный плейлист"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Вы не имеете доступа к этому ресурсу."
 
@@ -3183,6 +3261,10 @@ msgstr "Вы не имеете доступа к этому ресурсу."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Вы не имеете доступа к этому ресурсу."
 
@@ -3198,11 +3280,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Неверный запрос. параметр 'режим' не прошел."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Неверный запрос. параметр 'режим' является недопустимым"
 
@@ -3241,6 +3327,9 @@ msgstr "Добавить в умный блок"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Удалить"
 
@@ -3254,6 +3343,7 @@ msgstr "Дублировать плейлист"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Редактировать"
 
@@ -3334,16 +3424,19 @@ msgstr "Отзывы о поддержке"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Настройки потока обновлены."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "Путь должен быть указан"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Проблема с Liquidsoap ..."
 
@@ -3522,6 +3615,8 @@ msgstr "URL подключения к программе:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Обязательно)"
 
@@ -3549,26 +3644,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(Только для проверки, не будет опубликовано)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Примечание: все, что превысит размеры 600x600, будет изменено."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Покажите мне, что я посылаю "
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Постановления и условия"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Сменить пароль"
 
@@ -3597,6 +3702,7 @@ msgid "Remove watched directory"
 msgstr "Удалить просмотренную папку"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Вы не просматриваете никакие папки медиа-файлов."
 
@@ -3775,14 +3881,17 @@ msgid "Stream Settings"
 msgstr "Настройки потоковой передачи "
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Общие настройки"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "дБ"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Настройки выходного потока"
 
@@ -3900,14 +4009,17 @@ msgid "Limit to "
 msgstr "Ограничение до "
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3964,6 +4076,7 @@ msgid "Then you're good to go!"
 msgstr "Вы готовы!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Для более подробной справки читать %sруководство пользователя%s ."
@@ -4266,6 +4379,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Ретрансляция %s из %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Выберите страну"
 
@@ -4376,6 +4491,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Расписание, которое вы просматриваете, устарело!"
 
@@ -4410,6 +4527,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Выбранный файл не существует!"
 
@@ -4476,71 +4595,94 @@ msgstr "Просмотр метаданных записанного файла"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Показать содержимое"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Удалить все содержимое"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Отмена текущей программы"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Редактировать"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Редактировать программу"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Удалить этот выпуск"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Удалить этот выпуск и все последующие"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Нет доступа"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Невозможно перетащить повторяющиеся программы"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Невозможно переместить прошлую программу"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Невозможно переместить программу в прошедший период"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Невозможно переместить записанную программу менее, чем за 1 час до ее "
 "ретрансляции."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Программа была удалена, потому что записанная программа не существует!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "До ретрансляции необходимо ожидать 1 час."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Трек"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Проиграно"
 
@@ -4568,6 +4710,7 @@ msgid "No Records"
 msgstr "Нет записей"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4575,6 +4718,7 @@ msgstr ""
 "должна быть включена)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Политика конфиденциальности Sourcefabric "
 
@@ -4671,117 +4815,152 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Поддержать мою станцию на Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Поддержать мою станцию на Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr ""
-#~ "Установив этот флажок, я соглашаюсь с %sполитикой конфиденциальности%s "
-#~ "Sourcefabric."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+"Установив этот флажок, я соглашаюсь с %sполитикой конфиденциальности%s "
+"Sourcefabric."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Использование идентификации Airtime:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Использование идентификации Airtime:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Файл не существует в Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Файл не существует в Airtime."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Файл не существует в Airtime"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Файл не существует в Airtime"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Файл не существует в Airtime."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Файл не существует в Airtime."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Версия Airtime"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Версия Airtime"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Помогите улучшить Airtime, рассказав нам, как вы работаете с ним. Мы "
-#~ "будем собирать эту информацию регулярно. %s Нажмите кнопку \"Да, помочь "
-#~ "Airtime\" и мы позаботимся о том, чтобы те опции, которые вы используете, "
-#~ "постоянно совершенствовались."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"Помогите улучшить Airtime, рассказав нам, как вы работаете с ним. Мы будем "
+"собирать эту информацию регулярно. %s Нажмите кнопку \"Да, помочь Airtime\" "
+"и мы позаботимся о том, чтобы те опции, которые вы используете, постоянно "
+"совершенствовались."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Щелкните поле ниже, чтобы рекламировать свою станцию на %s Sourcefabric."
-#~ "org %s . В целях содействия вашей станции, опция 'Отправить отзыв о "
-#~ "поддержке »должна быть включена. Эти данные будут собираться в дополнение "
-#~ "к отзывам о поддержке."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Щелкните поле ниже, чтобы рекламировать свою станцию на %s Sourcefabric.org "
+"%s . В целях содействия вашей станции, опция 'Отправить отзыв о поддержке "
+"»должна быть включена. Эти данные будут собираться в дополнение к отзывам о "
+"поддержке."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Повторно сканировать просмотренную папку (Это полезно, если это сетевая "
-#~ "сборка, которая может быть не синхронна с Airtime)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Повторно сканировать просмотренную папку (Это полезно, если это сетевая "
+"сборка, которая может быть не синхронна с Airtime)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Добро пожаловать в Airtime!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Добро пожаловать в Airtime!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Вот как вы можете начать использовать Airtime для автоматизации вещания: "
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Вот как вы можете начать использовать Airtime для автоматизации вещания: "
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, открытое программное обеспечение для радио для "
-#~ "планирования и удаленного управления станцией.%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, открытое программное обеспечение для радио для планирования "
+"и удаленного управления станцией.%s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Сброс пароля Airtime"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Сброс пароля Airtime"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Авторское право Airtime &copy;Sourcefabric o.p.s. Все права защищены. "
-#~ "%sПоддерживается и распространяется под лицензией GNU GPL v.3 от "
-#~ "%sSourcefabric o.p.s.%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Авторское право Airtime &copy;Sourcefabric o.p.s. Все права защищены. "
+"%sПоддерживается и распространяется под лицензией GNU GPL v.3 от "
+"%sSourcefabric o.p.s.%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Помогите улучшить Airtime, рассказав нам, как вы работаете с ним. Мы "
-#~ "будем собирать эту информацию регулярно. %sНажмите \"Послать отзывы\" и "
-#~ "мы позаботимся о том, чтобы те опции, которые вы используете, постоянно "
-#~ "совершенствовались."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Помогите улучшить Airtime, рассказав нам, как вы работаете с ним. Мы будем "
+"собирать эту информацию регулярно. %sНажмите \"Послать отзывы\" и мы "
+"позаботимся о том, чтобы те опции, которые вы используете, постоянно "
+"совершенствовались."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Щелкните поле ниже, чтобы рекламировать вашу станцию на %s Sourcefabric."
-#~ "org %s ."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Щелкните поле ниже, чтобы рекламировать вашу станцию на %s Sourcefabric.org "
+"%s ."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr ""
-#~ "%sSourcefabric%s o.p.s. Airtime распространяется в соответствии с %sGNU "
-#~ "GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+"%sSourcefabric%s o.p.s. Airtime распространяется в соответствии с %sGNU GPL "
+"v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Добро пожаловать в онлайн демо-версию Airtime! Вы можете войти, используя "
-#~ "логин \"admin\" и пароль \"admin\"."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Добро пожаловать в онлайн демо-версию Airtime! Вы можете войти, используя "
+"логин \"admin\" и пароль \"admin\"."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Купить копию Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Купить копию Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "невозможно изменить размеры программы прошлого периода"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "невозможно изменить размеры программы прошлого периода"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Нельзя пересекать программы"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Нельзя пересекать программы"
diff --git a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
index de750d2f6..8133fbf54 100644
--- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Пренос уживо"
 
@@ -181,6 +182,7 @@ msgstr "Лозинка"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Жанр"
 
@@ -321,6 +323,8 @@ msgstr "Веб страница:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Језик:"
 
@@ -343,6 +347,10 @@ msgstr "Језик:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Сачувај"
 
@@ -360,6 +368,9 @@ msgstr "Одустани"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Корисничко име:"
 
@@ -367,22 +378,31 @@ msgstr "Корисничко име:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Лозинка:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Потврди Лозинку:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Име:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Презиме:"
 
@@ -391,55 +411,70 @@ msgstr "Презиме:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "Е-маил:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Мобилни Телефон:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Типова Корисника:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Гост"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "Диск-џокеј"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Водитељ Програма"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Администратор"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Име пријаве није јединствено."
 
@@ -532,10 +567,12 @@ msgstr "Диск-џокеји:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Пријава"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Упиши знаке које видиш на слици у наставку."
 
@@ -886,6 +923,7 @@ msgstr "Одабери критеријуме"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Албум"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Композитор"
 
@@ -915,6 +955,7 @@ msgstr "Композитор"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Диригент"
 
@@ -924,6 +965,8 @@ msgstr "Диригент"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Ауторско право"
 
@@ -935,6 +978,9 @@ msgstr "Ауторско право"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Творац"
 
@@ -950,6 +996,7 @@ msgstr "Кодирано је по"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Налепница"
 
@@ -966,6 +1014,7 @@ msgstr "Налепница"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Језик"
 
@@ -990,6 +1039,8 @@ msgstr "Задњи Пут Одиграна"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Дужина"
 
@@ -1005,6 +1056,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Расположење"
 
@@ -1035,6 +1087,9 @@ msgstr "Узорак Стопа (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Назив"
 
@@ -1064,6 +1119,7 @@ msgstr "Веб страница"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Година"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Мораш да пристанеш на правила о приватности."
 
@@ -1337,11 +1395,13 @@ msgstr "Вредност је потребна и не може да буде п
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Време Почетка"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Време Завршетка"
 
@@ -1517,6 +1577,12 @@ msgstr "Не може да траје више од 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Не можеш заказати преклапајуће емисије"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Именовање Некомерцијално Дијели Под Истим Условима"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Временска Зона Интерфејси:"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "Е-маил Адреса"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Неважећи вредности обрасца."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Молимо унеси своје корисничко име и лозинку"
 
@@ -1756,6 +1825,7 @@ msgstr "Погрешно корисничко име или лозинка. Мо
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1765,6 +1835,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "С обзиром е-маил није пронађен."
 
@@ -1783,16 +1854,19 @@ msgstr "Преузимање"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Корисник је успешно додат!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Корисник је успешно ажуриран!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Подешавања су успешно ажуриране!"
 
@@ -1964,6 +2038,7 @@ msgstr "Учитавање..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Све"
 
@@ -2732,6 +2807,8 @@ msgstr "Отвори библиотеку за додавање или укла
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Додај / Уклони Садржај"
 
@@ -3160,6 +3237,7 @@ msgstr "Непознати Списак Песама"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Не смеш да приступиш овог извора."
 
@@ -3174,6 +3252,10 @@ msgstr "Не смеш да приступиш овог извора."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Не смеш да приступите овог извора."
 
@@ -3189,11 +3271,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Неисправан захтев."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Неисправан захтев"
 
@@ -3232,6 +3318,9 @@ msgstr "Додај у Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Обриши"
 
@@ -3245,6 +3334,7 @@ msgstr "Удвостручавање"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Уређивање"
 
@@ -3325,16 +3415,19 @@ msgstr "Повратне Информације"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Пренос Подешавање је Ажурирано."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "пут би требао да буде специфициран"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Проблем са Liquidsoap..."
 
@@ -3513,6 +3606,8 @@ msgstr "URL веза Програмског извора:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Обавезно)"
 
@@ -3540,26 +3635,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(служи само за проверу, неће да буде објављена)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Напомена: Све већа од 600к600 ће да се мењају."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Покажи ми шта шаљем"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Услови и Одредбе"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Ресетуј лозинку"
 
@@ -3588,6 +3693,7 @@ msgid "Remove watched directory"
 msgstr "Уклони надзорану директоријуму"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Не пратиш ниједне медијске мапе."
 
@@ -3766,14 +3872,17 @@ msgid "Stream Settings"
 msgstr "Преносна Подешавања"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Глобална Подешавања"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Излазне Преносне Подешавање"
 
@@ -3891,14 +4000,17 @@ msgid "Limit to "
 msgstr "Ограничено за"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3955,6 +4067,7 @@ msgid "Then you're good to go!"
 msgstr "И већ је завршено!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "За детаљну помоћ, прочитај %sупутство за коришћење%s."
@@ -4257,6 +4370,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Реемитовање од %s од %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Одабери Државу"
 
@@ -4365,6 +4480,8 @@ msgstr "Застарео се прегледан распоред! (пример
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Застарео се прегледан распоред!"
 
@@ -4401,6 +4518,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Изабрани Фајл не постоји!"
 
@@ -4466,71 +4585,94 @@ msgstr "Метаподаци снимљеног фајла"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Програмски Садржај"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Уклони Све Садржаје"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Прекид Емисија"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Уреди у том случају"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Уређивање Програма"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Обриши у том случају"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Обриши у том случају и сви пратећи"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Дозвола одбијена"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Не можеш повући и испустити понављајуће емисије"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Не можеш преместити догађане емисије"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Не можеш преместити емисију у прошлости"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Не можеш преместити снимљене емисије раније од 1 сат времена пре њених "
 "реемитовања."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Емисија је избрисана јер је снимљена емисија не постоји!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Мораш причекати 1 сат за ре-емитовање."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Песма"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Пуштена"
 
@@ -4558,6 +4700,7 @@ msgid "No Records"
 msgstr "Нема Записа"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4565,6 +4708,7 @@ msgstr ""
 "буде омогућена)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Правила о Приватности"
 
@@ -4663,105 +4807,139 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Промовисати своју станицу на Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Промовисати своју станицу на Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "Избором ове опције, слажем се %sса правилима о приватности%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "Избором ове опције, слажем се %sса правилима о приватности%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Користи Airtime потврду идентитета:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Користи Airtime потврду идентитета:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Датотека не постоји."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Датотека не постоји."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Датотека не постоји"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Датотека не постоји"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Датотеке не постоје."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Датотеке не постоје."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Верзија"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Верзија"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Молимо, помози нашег рада.%sКликни у кутију 'Да, помажем Airtime-у'."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr "Молимо, помози нашег рада.%sКликни у кутију 'Да, помажем Airtime-у'."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Кликни на доњи оквир за оглашавање своју станицу на %sSourcefabric.org%s. "
-#~ "У циљу промовисања своју станицу, 'Пошаљи повратне информације' мора да "
-#~ "буде омогућена. Ови подаци ће се да прикупљају уз подршку поруци."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Кликни на доњи оквир за оглашавање своју станицу на %sSourcefabric.org%s. У "
+"циљу промовисања своју станицу, 'Пошаљи повратне информације' мора да буде "
+"омогућена. Ови подаци ће се да прикупљају уз подршку поруци."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Скенирај поново праћену директоријуму (Ово је корисно ако је мрежна веза "
-#~ "није синхронизована са Airtime-ом)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Скенирај поново праћену директоријуму (Ово је корисно ако је мрежна веза "
+"није синхронизована са Airtime-ом)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Добродошли код Airtime-а!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Добродошли код Airtime-а!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Ево како можеш да почнеш да користиш емитовања за аутоматизацију своје "
-#~ "емисије:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Ево како можеш да почнеш да користиш емитовања за аутоматизацију своје "
+"емисије:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, отворени радио софтвер за заказивање и даљинско вођење "
-#~ "станице. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, отворени радио софтвер за заказивање и даљинско вођење "
+"станице. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Ресетовање Лозинке"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Ресетовање Лозинке"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime власник ауторских права;Sourcefabric o.p.s. Сва права задржана."
-#~ "%sОдржавана и дистрибуира се под GNU GPL v.3 %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime власник ауторских права;Sourcefabric o.p.s. Сва права задржана."
+"%sОдржавана и дистрибуира се под GNU GPL v.3 %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Молимо, помози нашег рада.%sКликни у кутију 'Пошаљи повратне информације'."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Молимо, помози нашег рада.%sКликни у кутију 'Пошаљи повратне информације'."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Кликни на доњи оквир за промовисање своју станицу на %sSourcefabric.org%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Кликни на доњи оквир за промовисање своју станицу на %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr "%sSourcefabric%s o.p.s. Airtime се дистрибуира под %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime се дистрибуира под %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Добродошли! Можете се пријавити користећи панел за пријаву. Довољно је "
-#~ "само унети корисничко име и лозинку: 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Добродошли! Можете се пријавити користећи панел за пријаву. Довољно је само "
+"унети корисничко име и лозинку: 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Куповина свој примерак медијског простора"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Куповина свој примерак медијског простора"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "не можеш да промениш величину једној емисији у прошлости"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "не можеш да промениш величину једној емисији у прошлости"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Не би било слободно да се емисије преклапају"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Не би било слободно да се емисије преклапају"
diff --git a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
index dec29e808..71f88ce75 100644
--- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
@@ -101,6 +101,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "Prenos uživo"
 
@@ -181,6 +182,7 @@ msgstr "Lozinka"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "Žanr"
 
@@ -321,6 +323,8 @@ msgstr "Veb stranica:"
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "Jezik:"
 
@@ -343,6 +347,10 @@ msgstr "Jezik:"
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -360,6 +368,9 @@ msgstr "Odustani"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "Korisničko ime:"
 
@@ -367,22 +378,31 @@ msgstr "Korisničko ime:"
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "Lozinka:"
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "Potvrdi Lozinku:"
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "Ime:"
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "Prezime:"
 
@@ -391,55 +411,70 @@ msgstr "Prezime:"
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "E-mail:"
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "Mobilni Telefon:"
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype:"
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber:"
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "Tipova Korisnika:"
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "Gost"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "Disk-džokej"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "Voditelj Programa"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "Administrator"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "Ime prijave nije jedinstveno."
 
@@ -532,10 +567,12 @@ msgstr "Disk-džokeji:"
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "Prijava"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "Upiši znake koje vidiš na slici u nastavku."
 
@@ -886,6 +923,7 @@ msgstr "Odaberi kriterijume"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "Album"
 
@@ -907,6 +945,8 @@ msgstr "BPM"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "Kompozitor"
 
@@ -915,6 +955,7 @@ msgstr "Kompozitor"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "Dirigent"
 
@@ -924,6 +965,8 @@ msgstr "Dirigent"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "Autorsko pravo"
 
@@ -935,6 +978,9 @@ msgstr "Autorsko pravo"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "Tvorac"
 
@@ -950,6 +996,7 @@ msgstr "Kodirano je po"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC"
 
@@ -958,6 +1005,7 @@ msgstr "ISRC"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "Nalepnica"
 
@@ -966,6 +1014,7 @@ msgstr "Nalepnica"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "Jezik"
 
@@ -990,6 +1039,8 @@ msgstr "Zadnji Put Odigrana"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "Dužina"
 
@@ -1005,6 +1056,7 @@ msgstr "Mime"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "Raspoloženje"
 
@@ -1035,6 +1087,9 @@ msgstr "Uzorak Stopa (kHz)"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "Naziv"
 
@@ -1064,6 +1119,7 @@ msgstr "Veb stranica"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "Godina"
 
@@ -1327,6 +1383,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "Moraš da pristaneš na pravila o privatnosti."
 
@@ -1337,11 +1395,13 @@ msgstr "Vrednost je potrebna i ne može da bude prazan"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "Vreme Početka"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "Vreme Završetka"
 
@@ -1517,6 +1577,12 @@ msgstr "Ne može da traje više od 24h"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "Ne možeš zakazati preklapajuće emisije"
 
@@ -1691,6 +1757,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "Creative Commons Imenovanje Nekomercijalno Dijeli Pod Istim Uslovima"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "Vremenska Zona Interfejsi:"
 
@@ -1725,6 +1792,7 @@ msgid "Email Address"
 msgstr "E-mail Adresa"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr ""
@@ -1746,6 +1814,7 @@ msgstr "Nevažeći vrednosti obrasca."
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "Molimo unesi svoje korisničko ime i lozinku"
 
@@ -1756,6 +1825,7 @@ msgstr "Pogrešno korisničko ime ili lozinka. Molimo pokušaj ponovo."
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1765,6 +1835,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "S obzirom e-mail nije pronađen."
 
@@ -1783,16 +1854,19 @@ msgstr "Preuzimanje"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "Korisnik je uspešno dodat!"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "Korisnik je uspešno ažuriran!"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "Podešavanja su uspešno ažurirane!"
 
@@ -1964,6 +2038,7 @@ msgstr "Učitavanje..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "Sve"
 
@@ -2732,6 +2807,8 @@ msgstr "Otvori biblioteku za dodavanje ili uklanjanje sadržaja"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "Dodaj / Ukloni Sadržaj"
 
@@ -3160,6 +3237,7 @@ msgstr "Nepoznati Spisak Pesama"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "Ne smeš da pristupiš ovog izvora."
 
@@ -3174,6 +3252,10 @@ msgstr "Ne smeš da pristupiš ovog izvora."
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "Ne smeš da pristupite ovog izvora."
 
@@ -3189,11 +3271,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "Neispravan zahtev."
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "Neispravan zahtev"
 
@@ -3232,6 +3318,9 @@ msgstr "Dodaj u Smart Block"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "Obriši"
 
@@ -3245,6 +3334,7 @@ msgstr "Udvostručavanje"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "Uređivanje"
 
@@ -3325,16 +3415,19 @@ msgstr "Povratne Informacije"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "Prenos Podešavanje je Ažurirano."
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "put bi trebao da bude specificiran"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Problem sa Liquidsoap..."
 
@@ -3513,6 +3606,8 @@ msgstr "URL veza Programskog izvora:"
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "(Obavezno)"
 
@@ -3540,26 +3635,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "(služi samo za proveru, neće da bude objavljena)"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "Napomena: Sve veća od 600k600 će da se menjaju."
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "Pokaži mi šta šaljem"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "Uslovi i Odredbe"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "Resetuj lozinku"
 
@@ -3588,6 +3693,7 @@ msgid "Remove watched directory"
 msgstr "Ukloni nadzoranu direktorijumu"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "Ne pratiš nijedne medijske mape."
 
@@ -3766,14 +3872,17 @@ msgid "Stream Settings"
 msgstr "Prenosna Podešavanja"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "Globalna Podešavanja"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "dB"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "Izlazne Prenosne Podešavanje"
 
@@ -3891,14 +4000,17 @@ msgid "Limit to "
 msgstr "Ograničeno za"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3955,6 +4067,7 @@ msgid "Then you're good to go!"
 msgstr "I već je završeno!"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "Za detaljnu pomoć, pročitaj %suputstvo za korišćenje%s."
@@ -4257,6 +4370,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "Reemitovanje od %s od %s"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "Odaberi Državu"
 
@@ -4365,6 +4480,8 @@ msgstr "Zastareo se pregledan raspored! (primer neusklađenost)"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "Zastareo se pregledan raspored!"
 
@@ -4401,6 +4518,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "Izabrani Fajl ne postoji!"
 
@@ -4466,71 +4585,94 @@ msgstr "Metapodaci snimljenog fajla"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "Programski Sadržaj"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "Ukloni Sve Sadržaje"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "Prekid Emisija"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "Uredi u tom slučaju"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "Uređivanje Programa"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "Obriši u tom slučaju"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "Obriši u tom slučaju i svi prateći"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "Dozvola odbijena"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "Ne možeš povući i ispustiti ponavljajuće emisije"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "Ne možeš premestiti događane emisije"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "Ne možeš premestiti emisiju u prošlosti"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 "Ne možeš premestiti snimljene emisije ranije od 1 sat vremena pre njenih "
 "reemitovanja."
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "Emisija je izbrisana jer je snimljena emisija ne postoji!"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "Moraš pričekati 1 sat za re-emitovanje."
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "Pesma"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "Puštena"
 
@@ -4558,6 +4700,7 @@ msgid "No Records"
 msgstr "Nema Zapisa"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
@@ -4565,6 +4708,7 @@ msgstr ""
 "bude omogućena)."
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric Pravila o Privatnosti"
 
@@ -4663,107 +4807,139 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "Promovisati svoju stanicu na Sourcefabric.org"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "Promovisati svoju stanicu na Sourcefabric.org"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "Izborom ove opcije, slažem se %ssa pravilima o privatnosti%s."
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "Izborom ove opcije, slažem se %ssa pravilima o privatnosti%s."
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "Koristi Airtime potvrdu identiteta:"
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "Koristi Airtime potvrdu identiteta:"
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Datoteka ne postoji."
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Datoteka ne postoji."
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Datoteka ne postoji"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Datoteka ne postoji"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Datoteke ne postoje."
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Datoteke ne postoje."
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime Verzija"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime Verzija"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Da, pomažem Airtime-u'."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Da, pomažem Airtime-u'."
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "Klikni na donji okvir za oglašavanje svoju stanicu na %sSourcefabric.org"
-#~ "%s. U cilju promovisanja svoju stanicu, 'Pošalji povratne informacije' "
-#~ "mora da bude omogućena. Ovi podaci će se da prikupljaju uz podršku poruci."
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"Klikni na donji okvir za oglašavanje svoju stanicu na %sSourcefabric.org%s. "
+"U cilju promovisanja svoju stanicu, 'Pošalji povratne informacije' mora da "
+"bude omogućena. Ovi podaci će se da prikupljaju uz podršku poruci."
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr ""
-#~ "Skeniraj ponovo praćenu direktorijumu (Ovo je korisno ako je mrežna veza "
-#~ "nije sinhronizovana sa Airtime-om)"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+"Skeniraj ponovo praćenu direktorijumu (Ovo je korisno ako je mrežna veza "
+"nije sinhronizovana sa Airtime-om)"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "Dobrodošli kod Airtime-a!"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "Dobrodošli kod Airtime-a!"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr ""
-#~ "Evo kako možeš da počneš da koristiš emitovanja za automatizaciju svoje "
-#~ "emisije:"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+"Evo kako možeš da počneš da koristiš emitovanja za automatizaciju svoje "
+"emisije:"
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr ""
-#~ "%sAirtime%s %s, otvoreni radio softver za zakazivanje i daljinsko vođenje "
-#~ "stanice. %s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+"%sAirtime%s %s, otvoreni radio softver za zakazivanje i daljinsko vođenje "
+"stanice. %s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Resetovanje Lozinke"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Resetovanje Lozinke"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr ""
-#~ "Airtime vlasnik autorskih prava;Sourcefabric o.p.s. Sva prava zadržana."
-#~ "%sOdržavana i distribuira se pod GNU GPL v.3 %sSourcefabric o.p.s%s"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+"Airtime vlasnik autorskih prava;Sourcefabric o.p.s. Sva prava zadržana."
+"%sOdržavana i distribuira se pod GNU GPL v.3 %sSourcefabric o.p.s%s"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "Molimo, pomozi našeg rada.%sKlikni u kutiju 'Pošalji povratne "
-#~ "informacije'."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"Molimo, pomozi našeg rada.%sKlikni u kutiju 'Pošalji povratne informacije'."
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr ""
-#~ "Klikni na donji okvir za promovisanje svoju stanicu na %sSourcefabric.org"
-#~ "%s."
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+"Klikni na donji okvir za promovisanje svoju stanicu na %sSourcefabric.org%s."
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr "%sSourcefabric%s o.p.s. Airtime se distribuira pod %sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime se distribuira pod %sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "Dobrodošli! Možete se prijaviti koristeći panel za prijavu. Dovoljno je "
-#~ "samo uneti korisničko ime i lozinku: 'admin'."
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"Dobrodošli! Možete se prijaviti koristeći panel za prijavu. Dovoljno je samo "
+"uneti korisničko ime i lozinku: 'admin'."
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "Kupovina svoj primerak medijskog prostora"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "Kupovina svoj primerak medijskog prostora"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "ne možeš da promeniš veličinu jednoj emisiji u prošlosti"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "ne možeš da promeniš veličinu jednoj emisiji u prošlosti"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "Ne bi bilo slobodno da se emisije preklapaju"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "Ne bi bilo slobodno da se emisije preklapaju"
diff --git a/airtime_mvc/locale/template/airtime.po b/airtime_mvc/locale/template/airtime.po
index 0d7ce5abc..128175152 100644
--- a/airtime_mvc/locale/template/airtime.po
+++ b/airtime_mvc/locale/template/airtime.po
@@ -318,6 +318,8 @@ msgstr ""
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr ""
 
@@ -340,6 +342,10 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr ""
 
@@ -357,6 +363,9 @@ msgstr ""
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr ""
 
@@ -364,22 +373,31 @@ msgstr ""
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr ""
 
@@ -388,55 +406,70 @@ msgstr ""
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr ""
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr ""
 
@@ -529,10 +562,12 @@ msgstr ""
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr ""
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr ""
 
@@ -1320,6 +1355,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr ""
 
@@ -1509,6 +1546,7 @@ msgstr ""
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
 msgid "Cannot schedule overlapping shows"
 msgstr ""
 
@@ -1683,6 +1721,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr ""
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr ""
 
@@ -1736,6 +1775,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr ""
 
@@ -1746,6 +1786,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1753,6 +1794,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr ""
 
@@ -1771,16 +1813,19 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr ""
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr ""
 
@@ -1951,6 +1996,7 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr ""
 
@@ -2675,6 +2721,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr ""
 
@@ -3101,6 +3149,7 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr ""
 
@@ -3115,6 +3164,8 @@ msgstr ""
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
 msgid "You are not allowed to access this resource. "
 msgstr ""
 
@@ -3130,11 +3181,13 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
 msgid "Bad request. no 'mode' parameter passed."
 msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr ""
 
@@ -3173,6 +3226,9 @@ msgstr ""
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr ""
 
@@ -3186,6 +3242,7 @@ msgstr ""
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr ""
 
@@ -3266,16 +3323,19 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr ""
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr ""
 
@@ -3454,6 +3514,8 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr ""
 
@@ -3481,26 +3543,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr ""
 
@@ -3529,6 +3601,7 @@ msgid "Remove watched directory"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr ""
 
@@ -3706,14 +3779,17 @@ msgid "Stream Settings"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr ""
 
@@ -3829,14 +3905,17 @@ msgid "Limit to "
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3884,6 +3963,7 @@ msgid "Then you're good to go!"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr ""
@@ -4184,6 +4264,7 @@ msgid "Rebroadcast of %s from %s"
 msgstr ""
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
 msgid "Select Country"
 msgstr ""
 
@@ -4288,6 +4369,8 @@ msgstr ""
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr ""
 
@@ -4322,6 +4405,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr ""
 
@@ -4382,61 +4467,78 @@ msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
 msgid "Can't move show into past"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
 msgid "Show was deleted because recorded show does not exist!"
 msgstr ""
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
 msgid "Must wait 1 hour to rebroadcast."
 msgstr ""
 
@@ -4528,11 +4630,13 @@ msgid ""
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr ""
 
@@ -4567,3 +4671,114 @@ msgid ""
 "does not have enough disk space or the stor directory does not have correct "
 "write permissions."
 msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr ""
+
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr ""
+
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr ""
+
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr ""
+
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr ""
+
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:558
+msgid "File does not exist in Airtime."
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:578
+msgid "File does not exist in Airtime"
+msgstr ""
+
+#: airtime_mvc/application/controllers/ApiController.php:590
+msgid "File doesn't exist in Airtime."
+msgstr ""
+
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr ""
diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
index b5417735e..4a03feb84 100644
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
@@ -100,6 +100,7 @@ msgstr ""
 
 #: airtime_mvc/application/layouts/scripts/livestream.phtml:9
 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2
+#: airtime_mvc/application/layouts/scripts/bare.phtml:5
 msgid "Live stream"
 msgstr "插播流"
 
@@ -180,6 +181,7 @@ msgstr "密码"
 #: airtime_mvc/application/models/Block.php:1351
 #: airtime_mvc/application/services/HistoryService.php:1112
 #: airtime_mvc/application/controllers/LocaleController.php:73
+#: airtime_mvc/application/services/HistoryService.php:1109
 msgid "Genre"
 msgstr "风格"
 
@@ -320,6 +322,8 @@ msgstr "网站："
 #: airtime_mvc/application/forms/EditUser.php:118
 #: airtime_mvc/application/views/scripts/library/get-file-metadata.ajax.phtml:26
 #: airtime_mvc/application/forms/EditAudioMD.php:126
+#: airtime_mvc/application/forms/Login.php:48
+#: airtime_mvc/application/forms/EditUser.php:114
 msgid "Language:"
 msgstr "语言："
 
@@ -342,6 +346,10 @@ msgstr "语言："
 #: airtime_mvc/application/forms/SupportSettings.php:161
 #: airtime_mvc/application/controllers/LocaleController.php:283
 #: airtime_mvc/application/views/scripts/form/edit-user.phtml:163
+#: airtime_mvc/application/views/scripts/form/edit-user.phtml:160
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:115
+#: airtime_mvc/application/forms/AddUser.php:106
+#: airtime_mvc/application/forms/SupportSettings.php:158
 msgid "Save"
 msgstr "保存"
 
@@ -359,6 +367,9 @@ msgstr "取消"
 #: airtime_mvc/application/forms/AddUser.php:29
 #: airtime_mvc/application/forms/Login.php:23
 #: airtime_mvc/application/forms/EditUser.php:36
+#: airtime_mvc/application/forms/Login.php:19
+#: airtime_mvc/application/forms/EditUser.php:32
+#: airtime_mvc/application/forms/AddUser.php:25
 msgid "Username:"
 msgstr "用户名："
 
@@ -366,22 +377,31 @@ msgstr "用户名："
 #: airtime_mvc/application/forms/Login.php:38
 #: airtime_mvc/application/forms/BillingClient.php:172
 #: airtime_mvc/application/forms/EditUser.php:47
+#: airtime_mvc/application/forms/Login.php:34
+#: airtime_mvc/application/forms/EditUser.php:43
+#: airtime_mvc/application/forms/AddUser.php:34
 msgid "Password:"
 msgstr "密码："
 
 #: airtime_mvc/application/forms/AddUser.php:46
 #: airtime_mvc/application/forms/BillingClient.php:181
 #: airtime_mvc/application/forms/EditUser.php:56
+#: airtime_mvc/application/forms/EditUser.php:52
+#: airtime_mvc/application/forms/AddUser.php:42
 msgid "Verify Password:"
 msgstr "再次输入密码："
 
 #: airtime_mvc/application/forms/AddUser.php:55
 #: airtime_mvc/application/forms/EditUser.php:66
+#: airtime_mvc/application/forms/EditUser.php:62
+#: airtime_mvc/application/forms/AddUser.php:51
 msgid "Firstname:"
 msgstr "名："
 
 #: airtime_mvc/application/forms/AddUser.php:61
 #: airtime_mvc/application/forms/EditUser.php:74
+#: airtime_mvc/application/forms/EditUser.php:70
+#: airtime_mvc/application/forms/AddUser.php:57
 msgid "Lastname:"
 msgstr "姓："
 
@@ -390,55 +410,70 @@ msgstr "姓："
 #: airtime_mvc/application/forms/RegisterAirtime.php:51
 #: airtime_mvc/application/forms/EditUser.php:82
 #: airtime_mvc/application/forms/SupportSettings.php:46
+#: airtime_mvc/application/forms/EditUser.php:78
+#: airtime_mvc/application/forms/AddUser.php:63
 msgid "Email:"
 msgstr "电邮："
 
 #: airtime_mvc/application/forms/AddUser.php:76
 #: airtime_mvc/application/forms/EditUser.php:93
+#: airtime_mvc/application/forms/EditUser.php:89
+#: airtime_mvc/application/forms/AddUser.php:72
 msgid "Mobile Phone:"
 msgstr "手机："
 
 #: airtime_mvc/application/forms/AddUser.php:82
 #: airtime_mvc/application/forms/EditUser.php:101
+#: airtime_mvc/application/forms/EditUser.php:97
+#: airtime_mvc/application/forms/AddUser.php:78
 msgid "Skype:"
 msgstr "Skype帐号："
 
 #: airtime_mvc/application/forms/AddUser.php:88
 #: airtime_mvc/application/forms/EditUser.php:109
+#: airtime_mvc/application/forms/EditUser.php:105
+#: airtime_mvc/application/forms/AddUser.php:84
 msgid "Jabber:"
 msgstr "Jabber帐号："
 
 #: airtime_mvc/application/forms/AddUser.php:95
+#: airtime_mvc/application/forms/AddUser.php:91
 msgid "User Type:"
 msgstr "用户类型："
 
 #: airtime_mvc/application/forms/AddUser.php:99
 #: airtime_mvc/application/controllers/LocaleController.php:315
 #: airtime_mvc/application/controllers/LocaleController.php:313
+#: airtime_mvc/application/forms/AddUser.php:95
 msgid "Guest"
 msgstr "游客"
 
 #: airtime_mvc/application/forms/AddUser.php:100
 #: airtime_mvc/application/controllers/LocaleController.php:313
 #: airtime_mvc/application/controllers/LocaleController.php:311
+#: airtime_mvc/application/forms/AddUser.php:96
 msgid "DJ"
 msgstr "节目编辑"
 
 #: airtime_mvc/application/forms/AddUser.php:101
 #: airtime_mvc/application/controllers/LocaleController.php:314
 #: airtime_mvc/application/controllers/LocaleController.php:312
+#: airtime_mvc/application/forms/AddUser.php:97
 msgid "Program Manager"
 msgstr "节目主管"
 
 #: airtime_mvc/application/forms/AddUser.php:102
 #: airtime_mvc/application/controllers/LocaleController.php:312
 #: airtime_mvc/application/controllers/LocaleController.php:310
+#: airtime_mvc/application/forms/AddUser.php:98
 msgid "Admin"
 msgstr "系统管理员"
 
 #: airtime_mvc/application/forms/AddUser.php:120
 #: airtime_mvc/application/forms/EditUser.php:151
 #: airtime_mvc/application/forms/EditUser.php:139
+#: airtime_mvc/application/forms/EditUser.php:135
+#: airtime_mvc/application/forms/AddUser.php:116
 msgid "Login name is not unique."
 msgstr "帐号重名。"
 
@@ -531,10 +566,12 @@ msgstr "选择节目编辑："
 
 #: airtime_mvc/application/forms/Login.php:67
 #: airtime_mvc/application/views/scripts/login/index.phtml:3
+#: airtime_mvc/application/forms/Login.php:65
 msgid "Login"
 msgstr "登录"
 
 #: airtime_mvc/application/forms/Login.php:86
+#: airtime_mvc/application/forms/Login.php:83
 msgid "Type the characters you see in the picture below."
 msgstr "请输入图像里的字符。"
 
@@ -883,6 +920,7 @@ msgstr "选择属性"
 #: airtime_mvc/application/models/Block.php:1341
 #: airtime_mvc/application/services/HistoryService.php:1110
 #: airtime_mvc/application/controllers/LocaleController.php:66
+#: airtime_mvc/application/services/HistoryService.php:1107
 msgid "Album"
 msgstr "专辑"
 
@@ -904,6 +942,8 @@ msgstr "每分钟拍子数"
 #: airtime_mvc/application/services/HistoryService.php:1115
 #: airtime_mvc/application/services/HistoryService.php:1169
 #: airtime_mvc/application/controllers/LocaleController.php:69
+#: airtime_mvc/application/services/HistoryService.php:1112
+#: airtime_mvc/application/services/HistoryService.php:1166
 msgid "Composer"
 msgstr "作曲"
 
@@ -912,6 +952,7 @@ msgstr "作曲"
 #: airtime_mvc/application/models/Block.php:1345
 #: airtime_mvc/application/services/HistoryService.php:1120
 #: airtime_mvc/application/controllers/LocaleController.php:70
+#: airtime_mvc/application/services/HistoryService.php:1117
 msgid "Conductor"
 msgstr "指挥"
 
@@ -921,6 +962,8 @@ msgstr "指挥"
 #: airtime_mvc/application/services/HistoryService.php:1117
 #: airtime_mvc/application/services/HistoryService.php:1170
 #: airtime_mvc/application/controllers/LocaleController.php:71
+#: airtime_mvc/application/services/HistoryService.php:1114
+#: airtime_mvc/application/services/HistoryService.php:1167
 msgid "Copyright"
 msgstr "版权"
 
@@ -932,6 +975,9 @@ msgstr "版权"
 #: airtime_mvc/application/services/HistoryService.php:1149
 #: airtime_mvc/application/services/HistoryService.php:1166
 #: airtime_mvc/application/controllers/LocaleController.php:65
+#: airtime_mvc/application/services/HistoryService.php:1106
+#: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1163
 msgid "Creator"
 msgstr "作者"
 
@@ -947,6 +993,7 @@ msgstr "编曲"
 #: airtime_mvc/application/models/Block.php:1352
 #: airtime_mvc/application/services/HistoryService.php:1116
 #: airtime_mvc/application/controllers/LocaleController.php:74
+#: airtime_mvc/application/services/HistoryService.php:1113
 msgid "ISRC"
 msgstr "ISRC码"
 
@@ -955,6 +1002,7 @@ msgstr "ISRC码"
 #: airtime_mvc/application/models/Block.php:1353
 #: airtime_mvc/application/services/HistoryService.php:1114
 #: airtime_mvc/application/controllers/LocaleController.php:75
+#: airtime_mvc/application/services/HistoryService.php:1111
 msgid "Label"
 msgstr "标签"
 
@@ -963,6 +1011,7 @@ msgstr "标签"
 #: airtime_mvc/application/models/Block.php:1354
 #: airtime_mvc/application/services/HistoryService.php:1121
 #: airtime_mvc/application/controllers/LocaleController.php:76
+#: airtime_mvc/application/services/HistoryService.php:1118
 msgid "Language"
 msgstr "语种"
 
@@ -987,6 +1036,8 @@ msgstr "上次播放于"
 #: airtime_mvc/application/services/HistoryService.php:1111
 #: airtime_mvc/application/services/HistoryService.php:1168
 #: airtime_mvc/application/controllers/LocaleController.php:79
+#: airtime_mvc/application/services/HistoryService.php:1108
+#: airtime_mvc/application/services/HistoryService.php:1165
 msgid "Length"
 msgstr "时长"
 
@@ -1002,6 +1053,7 @@ msgstr "MIME信息"
 #: airtime_mvc/application/models/Block.php:1359
 #: airtime_mvc/application/services/HistoryService.php:1113
 #: airtime_mvc/application/controllers/LocaleController.php:81
+#: airtime_mvc/application/services/HistoryService.php:1110
 msgid "Mood"
 msgstr "风格"
 
@@ -1032,6 +1084,9 @@ msgstr "样本率（KHz）"
 #: airtime_mvc/application/services/HistoryService.php:1148
 #: airtime_mvc/application/services/HistoryService.php:1165
 #: airtime_mvc/application/controllers/LocaleController.php:64
+#: airtime_mvc/application/services/HistoryService.php:1105
+#: airtime_mvc/application/services/HistoryService.php:1145
+#: airtime_mvc/application/services/HistoryService.php:1162
 msgid "Title"
 msgstr "标题"
 
@@ -1061,6 +1116,7 @@ msgstr "网址"
 #: airtime_mvc/application/models/Block.php:1367
 #: airtime_mvc/application/services/HistoryService.php:1118
 #: airtime_mvc/application/controllers/LocaleController.php:88
+#: airtime_mvc/application/services/HistoryService.php:1115
 msgid "Year"
 msgstr "年代"
 
@@ -1322,6 +1378,8 @@ msgstr ""
 #: airtime_mvc/application/forms/SupportSettings.php:156
 #: airtime_mvc/application/forms/RegisterAirtime.php:169
 #: airtime_mvc/application/forms/SupportSettings.php:174
+#: airtime_mvc/application/forms/RegisterAirtime.php:166
+#: airtime_mvc/application/forms/SupportSettings.php:171
 msgid "You have to agree to privacy policy."
 msgstr "请先接受隐私策略"
 
@@ -1332,11 +1390,13 @@ msgstr "不能为空"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:32
 #: airtime_mvc/application/services/HistoryService.php:1146
+#: airtime_mvc/application/services/HistoryService.php:1143
 msgid "Start Time"
 msgstr "开始时间"
 
 #: airtime_mvc/application/forms/EditHistoryItem.php:44
 #: airtime_mvc/application/services/HistoryService.php:1147
+#: airtime_mvc/application/services/HistoryService.php:1144
 msgid "End Time"
 msgstr "结束时间"
 
@@ -1511,6 +1571,12 @@ msgstr "节目时长不能超过24小时"
 #: airtime_mvc/application/forms/AddShowWhen.php:325
 #: airtime_mvc/application/forms/AddShowWhen.php:331
 #: airtime_mvc/application/forms/AddShowWhen.php:336
+#: airtime_mvc/application/services/CalendarService.php:305
+#: airtime_mvc/application/services/CalendarService.php:288
+#: airtime_mvc/application/forms/AddShowWhen.php:280
+#: airtime_mvc/application/forms/AddShowWhen.php:318
+#: airtime_mvc/application/forms/AddShowWhen.php:324
+#: airtime_mvc/application/forms/AddShowWhen.php:329
 msgid "Cannot schedule overlapping shows"
 msgstr "节目时间设置与其他节目有冲突"
 
@@ -1685,6 +1751,7 @@ msgid "Creative Commons Attribution Noncommercial Share Alike"
 msgstr "知识共享署名-非商业应用且相同方式共享"
 
 #: airtime_mvc/application/forms/EditUser.php:125
+#: airtime_mvc/application/forms/EditUser.php:121
 msgid "Interface Timezone:"
 msgstr "用户界面使用的时区："
 
@@ -1719,6 +1786,7 @@ msgid "Email Address"
 msgstr "邮件地址"
 
 #: airtime_mvc/application/controllers/ListenerstatController.php:91
+#: airtime_mvc/application/controllers/ListenerstatController.php:56
 msgid ""
 "Please make sure admin user/password is correct on System->Streams page."
 msgstr "请检查系统->媒体流设置中，管理员用户/密码的设置是否正确。"
@@ -1738,6 +1806,7 @@ msgstr "无效的表格内容。"
 
 #: airtime_mvc/application/controllers/LoginController.php:43
 #: airtime_mvc/application/controllers/LoginController.php:35
+#: airtime_mvc/application/controllers/LoginController.php:34
 msgid "Please enter your user name and password"
 msgstr "请输入用户名和密码"
 
@@ -1748,6 +1817,7 @@ msgstr "用户名或密码错误，请重试。"
 
 #: airtime_mvc/application/controllers/LoginController.php:166
 #: airtime_mvc/application/controllers/LoginController.php:145
+#: airtime_mvc/application/controllers/LoginController.php:142
 msgid ""
 "Email could not be sent. Check your mail server settings and ensure it has "
 "been configured properly."
@@ -1755,6 +1825,7 @@ msgstr "邮件发送失败。请检查邮件服务器设置，并确定设置无
 
 #: airtime_mvc/application/controllers/LoginController.php:169
 #: airtime_mvc/application/controllers/LoginController.php:148
+#: airtime_mvc/application/controllers/LoginController.php:145
 msgid "Given email not found."
 msgstr "邮件地址没有找到。"
 
@@ -1773,16 +1844,19 @@ msgstr "下载"
 
 #: airtime_mvc/application/controllers/UserController.php:80
 #: airtime_mvc/application/controllers/UserController.php:76
+#: airtime_mvc/application/controllers/UserController.php:82
 msgid "User added successfully!"
 msgstr "用户已添加成功！"
 
 #: airtime_mvc/application/controllers/UserController.php:82
 #: airtime_mvc/application/controllers/UserController.php:78
+#: airtime_mvc/application/controllers/UserController.php:84
 msgid "User updated successfully!"
 msgstr "用于已成功更新！"
 
 #: airtime_mvc/application/controllers/UserController.php:161
 #: airtime_mvc/application/controllers/UserController.php:148
+#: airtime_mvc/application/controllers/UserController.php:154
 msgid "Settings updated successfully!"
 msgstr "设置更新成功！"
 
@@ -1953,6 +2027,7 @@ msgstr "加载中..."
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 #: airtime_mvc/application/controllers/LocaleController.php:90
 #: airtime_mvc/application/controllers/LocaleController.php:390
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:25
 msgid "All"
 msgstr "全部"
 
@@ -2710,6 +2785,8 @@ msgstr "打开媒体库，添加或者删除节目内容"
 #: airtime_mvc/application/views/scripts/showbuilder/index.phtml:15
 #: airtime_mvc/application/services/CalendarService.php:96
 #: airtime_mvc/application/controllers/LocaleController.php:301
+#: airtime_mvc/application/services/CalendarService.php:93
+#: airtime_mvc/application/services/CalendarService.php:100
 msgid "Add / Remove Content"
 msgstr "添加 / 删除内容"
 
@@ -3137,6 +3214,7 @@ msgstr "位置播放列表"
 
 #: airtime_mvc/application/controllers/ApiController.php:61
 #: airtime_mvc/application/controllers/Apiv2Controller.php:77
+#: airtime_mvc/application/controllers/ApiController.php:60
 msgid "You are not allowed to access this resource."
 msgstr "你没有访问该资源的权限"
 
@@ -3151,6 +3229,10 @@ msgstr "你没有访问该资源的权限"
 #: airtime_mvc/application/controllers/ApiController.php:504
 #: airtime_mvc/application/controllers/ApiController.php:608
 #: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:315
+#: airtime_mvc/application/controllers/ApiController.php:377
+#: airtime_mvc/application/controllers/ApiController.php:314
+#: airtime_mvc/application/controllers/ApiController.php:376
 msgid "You are not allowed to access this resource. "
 msgstr "你没有访问该资源的权限"
 
@@ -3166,11 +3248,15 @@ msgstr ""
 
 #: airtime_mvc/application/controllers/ApiController.php:931
 #: airtime_mvc/application/controllers/ApiController.php:854
+#: airtime_mvc/application/controllers/ApiController.php:641
+#: airtime_mvc/application/controllers/ApiController.php:638
 msgid "Bad request. no 'mode' parameter passed."
 msgstr "请求错误。没有提供‘模式’参数。"
 
 #: airtime_mvc/application/controllers/ApiController.php:941
 #: airtime_mvc/application/controllers/ApiController.php:864
+#: airtime_mvc/application/controllers/ApiController.php:651
+#: airtime_mvc/application/controllers/ApiController.php:648
 msgid "Bad request. 'mode' parameter is invalid"
 msgstr "请求错误。提供的‘模式’参数无效。"
 
@@ -3209,6 +3295,9 @@ msgstr "添加到智能模块"
 #: airtime_mvc/application/controllers/LibraryController.php:246
 #: airtime_mvc/application/controllers/LibraryController.php:265
 #: airtime_mvc/application/controllers/ShowbuilderController.php:202
+#: airtime_mvc/application/services/CalendarService.php:186
+#: airtime_mvc/application/services/CalendarService.php:201
+#: airtime_mvc/application/services/CalendarService.php:206
 msgid "Delete"
 msgstr "删除"
 
@@ -3222,6 +3311,7 @@ msgstr "复制播放列表"
 #: airtime_mvc/application/services/CalendarService.php:156
 #: airtime_mvc/application/controllers/LibraryController.php:241
 #: airtime_mvc/application/controllers/LibraryController.php:263
+#: airtime_mvc/application/services/CalendarService.php:157
 msgid "Edit"
 msgstr "编辑"
 
@@ -3302,16 +3392,19 @@ msgstr "意见反馈"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:277
 #: airtime_mvc/application/controllers/PreferenceController.php:336
+#: airtime_mvc/application/controllers/PreferenceController.php:332
 msgid "Stream Setting Updated."
 msgstr "流设置已更新。"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:310
 #: airtime_mvc/application/controllers/PreferenceController.php:369
+#: airtime_mvc/application/controllers/PreferenceController.php:365
 msgid "path should be specified"
 msgstr "请指定路径"
 
 #: airtime_mvc/application/controllers/PreferenceController.php:405
 #: airtime_mvc/application/controllers/PreferenceController.php:464
+#: airtime_mvc/application/controllers/PreferenceController.php:460
 msgid "Problem with Liquidsoap..."
 msgstr "Liquidsoap出错..."
 
@@ -3490,6 +3583,8 @@ msgstr "节目定制输入流的链接地址："
 #: airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml:59
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:51
 #: airtime_mvc/application/views/scripts/form/preferences_general.phtml:97
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:47
 msgid "(Required)"
 msgstr "（必填）"
 
@@ -3517,26 +3612,36 @@ msgstr ""
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:35
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:66
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:81
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:61
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:76
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:65
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:79
 msgid "(for verification purposes only, will not be published)"
 msgstr "（仅作为验证目的使用，不会用于发布）"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:152
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:110
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:156
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:151
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:150
 msgid "Note: Anything larger than 600x600 will be resized."
 msgstr "注意：大于600x600的图片将会被缩放"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:166
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:169
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:164
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:164
 msgid "Show me what I am sending "
 msgstr "显示我所发送的信息"
 
 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:180
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:178
 msgid "Terms and Conditions"
 msgstr "使用条款"
 
 #: airtime_mvc/application/views/scripts/form/login.phtml:36
 #: airtime_mvc/application/views/scripts/login/password-restore.phtml:3
+#: airtime_mvc/application/views/scripts/form/login.phtml:34
 msgid "Reset password"
 msgstr "重置密码"
 
@@ -3565,6 +3670,7 @@ msgid "Remove watched directory"
 msgstr "移除监控文件夹"
 
 #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:49
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:50
 msgid "You are not watching any media folders."
 msgstr "你没有正在监控的文件夹。"
 
@@ -3742,14 +3848,17 @@ msgid "Stream Settings"
 msgstr "流设定"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:13
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:12
 msgid "Global Settings"
 msgstr "全局设定"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:88
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:87
 msgid "dB"
 msgstr "分贝"
 
 #: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:107
+#: airtime_mvc/application/views/scripts/preference/stream-setting.phtml:106
 msgid "Output Stream Settings"
 msgstr "输出流设定"
 
@@ -3866,14 +3975,17 @@ msgid "Limit to "
 msgstr "限制到"
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:27
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:26
 msgid "Failed"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:28
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:27
 msgid "Pending"
 msgstr ""
 
 #: airtime_mvc/application/views/scripts/plupload/index.phtml:31
+#: airtime_mvc/application/views/scripts/plupload/index.phtml:30
 msgid "Recent Uploads"
 msgstr ""
 
@@ -3927,6 +4039,7 @@ msgid "Then you're good to go!"
 msgstr "然后就大功告成啦！"
 
 #: airtime_mvc/application/views/scripts/dashboard/help.phtml:15
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:13
 #, php-format
 msgid "For more detailed help, read the %suser manual%s."
 msgstr "详细的指导，可以参考%s用户手册%s。"
@@ -4229,6 +4342,8 @@ msgid "Rebroadcast of %s from %s"
 msgstr "%s是%s的重播"
 
 #: airtime_mvc/application/models/Preference.php:650
+#: airtime_mvc/application/models/Preference.php:662
+#: airtime_mvc/application/models/Preference.php:655
 msgid "Select Country"
 msgstr "选择国家"
 
@@ -4333,6 +4448,8 @@ msgstr "当前节目内容表（节目已更改）需要刷新"
 #: airtime_mvc/application/models/Scheduler.php:132
 #: airtime_mvc/application/models/Scheduler.php:460
 #: airtime_mvc/application/models/Scheduler.php:498
+#: airtime_mvc/application/models/Scheduler.php:444
+#: airtime_mvc/application/models/Scheduler.php:482
 msgid "The schedule you're viewing is out of date!"
 msgstr "当前节目内容需要刷新！"
 
@@ -4367,6 +4484,8 @@ msgstr ""
 
 #: airtime_mvc/application/models/Scheduler.php:216
 #: airtime_mvc/application/models/Scheduler.php:305
+#: airtime_mvc/application/models/Scheduler.php:200
+#: airtime_mvc/application/models/Scheduler.php:289
 msgid "A selected File does not exist!"
 msgstr "某个选中的文件不存在。"
 
@@ -4432,69 +4551,92 @@ msgstr "查看录制文件的元数据"
 
 #: airtime_mvc/application/services/CalendarService.php:77
 #: airtime_mvc/application/services/CalendarService.php:120
+#: airtime_mvc/application/services/CalendarService.php:121
 msgid "Show Content"
 msgstr "显示内容"
 
 #: airtime_mvc/application/services/CalendarService.php:109
+#: airtime_mvc/application/services/CalendarService.php:111
 msgid "Remove All Content"
 msgstr "清空全部内容"
 
 #: airtime_mvc/application/services/CalendarService.php:130
 #: airtime_mvc/application/services/CalendarService.php:134
+#: airtime_mvc/application/services/CalendarService.php:131
+#: airtime_mvc/application/services/CalendarService.php:135
 msgid "Cancel Current Show"
 msgstr "取消当前节目"
 
 #: airtime_mvc/application/services/CalendarService.php:151
 #: airtime_mvc/application/services/CalendarService.php:166
+#: airtime_mvc/application/services/CalendarService.php:152
+#: airtime_mvc/application/services/CalendarService.php:167
 msgid "Edit This Instance"
 msgstr "编辑此节目"
 
 #: airtime_mvc/application/services/CalendarService.php:161
 #: airtime_mvc/application/services/CalendarService.php:172
+#: airtime_mvc/application/services/CalendarService.php:162
+#: airtime_mvc/application/services/CalendarService.php:173
 msgid "Edit Show"
 msgstr "编辑节目"
 
 #: airtime_mvc/application/services/CalendarService.php:190
+#: airtime_mvc/application/services/CalendarService.php:191
 msgid "Delete This Instance"
 msgstr "删除当前节目"
 
 #: airtime_mvc/application/services/CalendarService.php:195
+#: airtime_mvc/application/services/CalendarService.php:196
 msgid "Delete This Instance and All Following"
 msgstr "删除当前以及随后的系列节目"
 
 #: airtime_mvc/application/services/CalendarService.php:249
+#: airtime_mvc/application/services/CalendarService.php:250
 msgid "Permission denied"
 msgstr "没有编辑权限"
 
 #: airtime_mvc/application/services/CalendarService.php:253
+#: airtime_mvc/application/services/CalendarService.php:254
 msgid "Can't drag and drop repeating shows"
 msgstr "系列中的节目无法拖拽"
 
 #: airtime_mvc/application/services/CalendarService.php:262
+#: airtime_mvc/application/services/CalendarService.php:263
 msgid "Can't move a past show"
 msgstr "已经结束的节目无法更改时间"
 
 #: airtime_mvc/application/services/CalendarService.php:297
+#: airtime_mvc/application/services/CalendarService.php:298
+#: airtime_mvc/application/services/CalendarService.php:281
 msgid "Can't move show into past"
 msgstr "节目不能设置到已过去的时间点"
 
 #: airtime_mvc/application/services/CalendarService.php:317
+#: airtime_mvc/application/services/CalendarService.php:318
+#: airtime_mvc/application/services/CalendarService.php:301
 msgid "Can't move a recorded show less than 1 hour before its rebroadcasts."
 msgstr "录音和重播节目之间的间隔必须大于等于1小时。"
 
 #: airtime_mvc/application/services/CalendarService.php:327
+#: airtime_mvc/application/services/CalendarService.php:328
+#: airtime_mvc/application/services/CalendarService.php:311
 msgid "Show was deleted because recorded show does not exist!"
 msgstr "录音节目不存在，节目已删除！"
 
 #: airtime_mvc/application/services/CalendarService.php:334
+#: airtime_mvc/application/services/CalendarService.php:335
+#: airtime_mvc/application/services/CalendarService.php:318
 msgid "Must wait 1 hour to rebroadcast."
 msgstr "重播节目必须设置于1小时之后。"
 
 #: airtime_mvc/application/services/HistoryService.php:1119
+#: airtime_mvc/application/services/HistoryService.php:1116
 msgid "Track"
 msgstr "曲目"
 
 #: airtime_mvc/application/services/HistoryService.php:1167
+#: airtime_mvc/application/services/HistoryService.php:1164
 msgid "Played"
 msgstr "已播放"
 
@@ -4522,11 +4664,13 @@ msgid "No Records"
 msgstr "无记录"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:41
 msgid ""
 "(In order to promote your station, 'Send support feedback' must be enabled)."
 msgstr "（为了推广您的电台，请启用‘发送支持反馈’）"
 
 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:191
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:186
 msgid "Sourcefabric Privacy Policy"
 msgstr "Sourcefabric隐私策略"
 
@@ -4618,98 +4762,133 @@ msgstr ""
 msgid "Purchase your copy of %s"
 msgstr ""
 
-#~ msgid "Promote my station on Sourcefabric.org"
-#~ msgstr "在Sourcefabric.org上推广我的电台"
+#: airtime_mvc/application/forms/RegisterAirtime.php:126
+#: airtime_mvc/application/forms/SupportSettings.php:122
+msgid "Promote my station on Sourcefabric.org"
+msgstr "在Sourcefabric.org上推广我的电台"
 
-#~ msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
-#~ msgstr "我同意Sourcefabric的%s隐私策略%s"
+#: airtime_mvc/application/forms/RegisterAirtime.php:149
+#: airtime_mvc/application/forms/SupportSettings.php:148
+#, php-format
+msgid "By checking this box, I agree to Sourcefabric's %sprivacy policy%s."
+msgstr "我同意Sourcefabric的%s隐私策略%s"
 
-#~ msgid "Use Airtime Authentication:"
-#~ msgstr "使用Airtime的用户认证："
+#: airtime_mvc/application/forms/AddShowLiveStream.php:10
+msgid "Use Airtime Authentication:"
+msgstr "使用Airtime的用户认证："
 
-#~ msgid "File does not exist in Airtime."
-#~ msgstr "Airtime中不存在该文件。"
+#: airtime_mvc/application/controllers/ApiController.php:558
+#: airtime_mvc/application/controllers/ApiController.php:555
+msgid "File does not exist in Airtime."
+msgstr "Airtime中不存在该文件。"
 
-#~ msgid "File does not exist in Airtime"
-#~ msgstr "Airtime中不存在该文件。"
+#: airtime_mvc/application/controllers/ApiController.php:578
+#: airtime_mvc/application/controllers/ApiController.php:575
+msgid "File does not exist in Airtime"
+msgstr "Airtime中不存在该文件。"
 
-#~ msgid "File doesn't exist in Airtime."
-#~ msgstr "Airtime中不存在该文件。"
+#: airtime_mvc/application/controllers/ApiController.php:590
+#: airtime_mvc/application/controllers/ApiController.php:587
+msgid "File doesn't exist in Airtime."
+msgstr "Airtime中不存在该文件。"
 
-#~ msgid "Airtime Version"
-#~ msgstr "Airtime版本"
+#: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14
+msgid "Airtime Version"
+msgstr "Airtime版本"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting us know how you are using it. This info "
-#~ "will be collected regularly in order to enhance your user experience."
-#~ "%sClick 'Yes, help Airtime' and we'll make sure the features you use are "
-#~ "constantly improving."
-#~ msgstr ""
-#~ "通过告诉我们您使用Airtime的方式，可以帮助我们改进Airtime。这些信息会周期性"
-#~ "的收集起来，并且提高您的用户体验。%s点击‘是的，帮助Airtime’，就能让我们确"
-#~ "保你所使用的功能持续地得到改进。"
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:6
+#, php-format
+msgid ""
+"Help Airtime improve by letting us know how you are using it. This info will "
+"be collected regularly in order to enhance your user experience.%sClick "
+"'Yes, help Airtime' and we'll make sure the features you use are constantly "
+"improving."
+msgstr ""
+"通过告诉我们您使用Airtime的方式，可以帮助我们改进Airtime。这些信息会周期性的"
+"收集起来，并且提高您的用户体验。%s点击‘是的，帮助Airtime’，就能让我们确保你所"
+"使用的功能持续地得到改进。"
 
-#~ msgid ""
-#~ "Click the box below to advertise your station on %sSourcefabric.org%s. In "
-#~ "order to promote your station, 'Send support feedback' must be enabled. "
-#~ "This data will be collected in addition to the support feedback."
-#~ msgstr ""
-#~ "勾选下面的选项，就可以在%sSourcefabric.org%s上推广您的电台。前提是‘发送支"
-#~ "持反馈’选项已经启用。这些数据将会被收集起来以作为支持反馈的信息。"
+#: airtime_mvc/application/views/scripts/form/register-dialog.phtml:25
+#, php-format
+msgid ""
+"Click the box below to advertise your station on %sSourcefabric.org%s. In "
+"order to promote your station, 'Send support feedback' must be enabled. This "
+"data will be collected in addition to the support feedback."
+msgstr ""
+"勾选下面的选项，就可以在%sSourcefabric.org%s上推广您的电台。前提是‘发送支持反"
+"馈’选项已经启用。这些数据将会被收集起来以作为支持反馈的信息。"
 
-#~ msgid ""
-#~ "Rescan watched directory (This is useful if it is network mount and may "
-#~ "be out of sync with Airtime)"
-#~ msgstr "重新扫描监控的文件夹（针对于需要手动更新的网络存储路径）"
+#: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:43
+msgid ""
+"Rescan watched directory (This is useful if it is network mount and may be "
+"out of sync with Airtime)"
+msgstr "重新扫描监控的文件夹（针对于需要手动更新的网络存储路径）"
 
-#~ msgid "Welcome to Airtime!"
-#~ msgstr "欢迎使用Airtime！"
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:3
+msgid "Welcome to Airtime!"
+msgstr "欢迎使用Airtime！"
 
-#~ msgid ""
-#~ "Here's how you can get started using Airtime to automate your broadcasts: "
-#~ msgstr "简单介绍如何使用Airtime来自动完成播放："
+#: airtime_mvc/application/views/scripts/dashboard/help.phtml:4
+msgid ""
+"Here's how you can get started using Airtime to automate your broadcasts: "
+msgstr "简单介绍如何使用Airtime来自动完成播放："
 
-#~ msgid ""
-#~ "%sAirtime%s %s, the open radio software for scheduling and remote station "
-#~ "management. %s"
-#~ msgstr "%sAirtime%s %s， 提供内容编排及远程管理的开源电台软件。%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:5
+#, php-format
+msgid ""
+"%sAirtime%s %s, the open radio software for scheduling and remote station "
+"management. %s"
+msgstr "%sAirtime%s %s， 提供内容编排及远程管理的开源电台软件。%s"
 
-#~ msgid "Airtime Password Reset"
-#~ msgstr "Airtime密码重置"
+#: airtime_mvc/application/models/Auth.php:36
+msgid "Airtime Password Reset"
+msgstr "Airtime密码重置"
 
-#~ msgid ""
-#~ "Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved."
-#~ "%sMaintained and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
-#~ msgstr "Airtime 遵循GPL第三版协议，%s由%sSourcefabric o.p.s%s版权所有。"
+#: airtime_mvc/application/layouts/scripts/login.phtml:16
+#, php-format
+msgid ""
+"Airtime Copyright &copy;Sourcefabric o.p.s. All rights reserved.%sMaintained "
+"and distributed under GNU GPL v.3 by %sSourcefabric o.p.s%s"
+msgstr "Airtime 遵循GPL第三版协议，%s由%sSourcefabric o.p.s%s版权所有。"
 
-#~ msgid ""
-#~ "Help Airtime improve by letting Sourcefabric know how you are using it. "
-#~ "This information will be collected regularly in order to enhance your "
-#~ "user experience.%sClick the 'Send support feedback' box and we'll make "
-#~ "sure the features you use are constantly improving."
-#~ msgstr ""
-#~ "通过告诉Sourcefabric您是如何使用Airtime的，可以帮助我们改进Airtime。这些信"
-#~ "息将会被手机起来用于提高您的客户体验。%s只要勾选‘发送支持反馈’，就能确保让"
-#~ "我们持续改进您所使用"
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:5
+#, php-format
+msgid ""
+"Help Airtime improve by letting Sourcefabric know how you are using it. This "
+"information will be collected regularly in order to enhance your user "
+"experience.%sClick the 'Send support feedback' box and we'll make sure the "
+"features you use are constantly improving."
+msgstr ""
+"通过告诉Sourcefabric您是如何使用Airtime的，可以帮助我们改进Airtime。这些信息"
+"将会被手机起来用于提高您的客户体验。%s只要勾选‘发送支持反馈’，就能确保让我们"
+"持续改进您所使用"
 
-#~ msgid "Click the box below to promote your station on %sSourcefabric.org%s."
-#~ msgstr "勾选随后的选项就可以在%sSourcefabric.org%s上推广您的电台。"
+#: airtime_mvc/application/views/scripts/form/support-setting.phtml:23
+#, php-format
+msgid "Click the box below to promote your station on %sSourcefabric.org%s."
+msgstr "勾选随后的选项就可以在%sSourcefabric.org%s上推广您的电台。"
 
-#~ msgid ""
-#~ "%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
-#~ msgstr "%sSourcefabric%s o.p.s. Airtime遵循%sGNU GPL v.3%s"
+#: airtime_mvc/application/views/scripts/dashboard/about.phtml:13
+#, php-format
+msgid ""
+"%sSourcefabric%s o.p.s. Airtime is distributed under the %sGNU GPL v.3%s"
+msgstr "%sSourcefabric%s o.p.s. Airtime遵循%sGNU GPL v.3%s"
 
-#~ msgid ""
-#~ "Welcome to the online Airtime demo! You can log in using the username "
-#~ "'admin' and the password 'admin'."
-#~ msgstr ""
-#~ "欢迎来到在线Airtime演示！你可以用‘admin’和‘admin’作为用户名和密码登录。"
+#: airtime_mvc/application/views/scripts/login/index.phtml:7
+msgid ""
+"Welcome to the online Airtime demo! You can log in using the username "
+"'admin' and the password 'admin'."
+msgstr ""
+"欢迎来到在线Airtime演示！你可以用‘admin’和‘admin’作为用户名和密码登录。"
 
-#~ msgid "Purchase your copy of Airtime"
-#~ msgstr "购买你使用的Airtime"
+#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
+msgid "Purchase your copy of Airtime"
+msgstr "购买你使用的Airtime"
 
-#~ msgid "can't resize a past show"
-#~ msgstr "已结束的节目不能调整时长"
+#: airtime_mvc/application/models/ShowInstance.php:257
+msgid "can't resize a past show"
+msgstr "已结束的节目不能调整时长"
 
-#~ msgid "Should not overlap shows"
-#~ msgstr "节目时间不能有重合"
+#: airtime_mvc/application/models/ShowInstance.php:279
+msgid "Should not overlap shows"
+msgstr "节目时间不能有重合"
diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index a8d29c871..50373fea7 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -56,8 +56,8 @@ if (file_exists('/usr/share/php/libzend-framework-php')) {
     set_include_path('/usr/share/php/libzend-framework-php' . PATH_SEPARATOR . get_include_path());
 }
 
-//amazon directory
-set_include_path(APPLICATION_PATH . '/amazon' . PATH_SEPARATOR . get_include_path());
+//cloud storage directory
+set_include_path(APPLICATION_PATH . '/cloud_storage' . PATH_SEPARATOR . get_include_path());
 
 //Upgrade directory
 set_include_path(APPLICATION_PATH . '/upgrade/' . PATH_SEPARATOR . get_include_path());
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py b/python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
index f17b1711d..39ab70400 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
@@ -18,7 +18,7 @@ class AnalyzerPipeline:
     """
     
     @staticmethod
-    def run_analysis(queue, audio_file_path, import_directory, original_filename):
+    def run_analysis(queue, audio_file_path, import_directory, original_filename, station_domain):
         """Analyze and import an audio file, and put all extracted metadata into queue.
         
         Keyword arguments:
@@ -31,6 +31,7 @@ class AnalyzerPipeline:
                                preserve. The file at audio_file_path typically has a 
                                temporary randomly generated name, which is why we want
                                to know what the original name was.  
+            station_domain: The Airtime Pro account's domain name. i.e. bananas
         """
         # It is super critical to initialize a separate log file here so that we 
         # don't inherit logging/locks from the parent process. Supposedly
@@ -52,6 +53,7 @@ class AnalyzerPipeline:
             # First, we extract the ID3 tags and other metadata:
             metadata = dict()
             metadata = MetadataAnalyzer.analyze(audio_file_path, metadata)
+            metadata["station_domain"] = station_domain
             #metadata = FileMoverAnalyzer.move(audio_file_path, import_directory, original_filename, metadata)
             csu = CloudStorageUploader()
             metadata = csu.upload_obj(audio_file_path, metadata)
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py b/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
index b52ac0113..d060f3bcc 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
@@ -6,7 +6,7 @@ from libcloud.storage.providers import get_driver
 from libcloud.storage.types import Provider, ContainerDoesNotExistError, ObjectDoesNotExistError
 
 
-CONFIG_PATH = '/etc/airtime-saas/amazon.conf'
+CONFIG_PATH = '/etc/airtime-saas/cloud_storage.conf'
 
 class CloudStorageUploader:
     """ A class that uses Apache Libcloud's Storage API to upload objects into
@@ -27,7 +27,8 @@ class CloudStorageUploader:
     def __init__(self):
         config = aa.AirtimeAnalyzerServer.read_config_file(CONFIG_PATH)
         
-        CLOUD_STORAGE_CONFIG_SECTION = "cloud_storage"
+        CLOUD_STORAGE_CONFIG_SECTION = config.get("current_backend", "storage_backend")
+        self._storage_backend = CLOUD_STORAGE_CONFIG_SECTION
         self._provider = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'provider')
         self._bucket = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'bucket')
         self._api_key = config.get(CLOUD_STORAGE_CONFIG_SECTION, 'api_key')
@@ -70,7 +71,8 @@ class CloudStorageUploader:
         except ContainerDoesNotExistError:
             container = driver.create_container(self._bucket)
         
-        extra = {'meta_data': {'filename': file_base_name}}
+        extra = {'meta_data': {'filename': file_base_name,
+                               'station_domain': metadata["station_domain"]}}
         
         obj = driver.upload_object(file_path=audio_file_path,
                                    container=container,
@@ -90,5 +92,6 @@ class CloudStorageUploader:
         metadata["filename"] = file_base_name
         
         metadata["resource_id"] = object_name
+        metadata["storage_backend"] = self._storage_backend
         return metadata
 
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/message_listener.py b/python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
index f106258e1..b61c2133e 100644
--- a/python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
+++ b/python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
@@ -161,12 +161,13 @@ class MessageListener:
             msg_dict = json.loads(body)
             api_key         = msg_dict["api_key"]
             callback_url    = msg_dict["callback_url"]
+            station_domain  = msg_dict["station_domain"]
             
             audio_file_path = msg_dict["tmp_file_path"]
             import_directory = msg_dict["import_directory"]
             original_filename = msg_dict["original_filename"]
             
-            audio_metadata = MessageListener.spawn_analyzer_process(audio_file_path, import_directory, original_filename)
+            audio_metadata = MessageListener.spawn_analyzer_process(audio_file_path, import_directory, original_filename, station_domain)
             StatusReporter.report_success_to_callback_url(callback_url, api_key, audio_metadata)
 
         except KeyError as e:
@@ -205,11 +206,11 @@ class MessageListener:
             channel.basic_ack(delivery_tag=method_frame.delivery_tag)
     
     @staticmethod
-    def spawn_analyzer_process(audio_file_path, import_directory, original_filename):
+    def spawn_analyzer_process(audio_file_path, import_directory, original_filename, station_domain):
         ''' Spawn a child process to analyze and import a new audio file. '''
         q = multiprocessing.Queue()
         p = multiprocessing.Process(target=AnalyzerPipeline.run_analysis, 
-                        args=(q, audio_file_path, import_directory, original_filename))
+                        args=(q, audio_file_path, import_directory, original_filename, station_domain))
         p.start()
         p.join()
         if p.exitcode == 0:
diff --git a/python_apps/pypo/pypofile.py b/python_apps/pypo/pypofile.py
index 2c14bbbf5..998c7bd26 100644
--- a/python_apps/pypo/pypofile.py
+++ b/python_apps/pypo/pypofile.py
@@ -2,17 +2,19 @@
 
 from threading import Thread
 from Queue import Empty
-from cloud_storage_downloader import CloudStorageDownloader
 
 import logging
 import shutil
 import os
 import sys
 import stat
-
+import requests
+import ConfigParser
 
 from std_err_override import LogWriter
 
+CONFIG_PATH = '/etc/airtime/airtime.conf'
+
 # configure logging
 logging.config.fileConfig("logging.cfg")
 logger = logging.getLogger()
@@ -37,12 +39,8 @@ class PypoFile(Thread):
         """
         src = media_item['uri']
         dst = media_item['dst']
-        
-        try:
-            src_size = os.path.getsize(src)
-        except Exception, e:
-            self.logger.error("Could not get size of source file: %s", src)
-            return
+
+        src_size = media_item['filesize']
 
         dst_exists = True
         try:
@@ -68,7 +66,23 @@ class PypoFile(Thread):
                 """
                 copy will overwrite dst if it already exists
                 """
-                shutil.copy(src, dst)
+                #shutil.copy(src, dst)                
+                config = self.read_config_file(CONFIG_PATH)
+                CONFIG_SECTION = "general"
+                username = config.get(CONFIG_SECTION, 'api_key')
+                url = media_item['download_url']
+                
+                with open(dst, "wb") as handle:
+                    response = requests.get(url, auth=requests.auth.HTTPBasicAuth(username, ''), stream=True)
+                    
+                    if not response.ok:
+                        raise Exception("%s - Error occurred downloading file" % response.status_code)
+                    
+                    for chunk in response.iter_content(1024):
+                        if not chunk:
+                            break
+                        
+                        handle.write(chunk)
 
                 #make file world readable
                 os.chmod(dst, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH)
@@ -108,6 +122,19 @@ class PypoFile(Thread):
 
         return media_item
 
+    def read_config_file(self, config_path):
+        """Parse the application's config file located at config_path."""
+        config = ConfigParser.SafeConfigParser()
+        try:
+            config.readfp(open(config_path))
+        except IOError as e:
+            logging.debug("Failed to open config file at %s: %s" % (config_path, e.strerror))
+            sys.exit()
+        except Exception:
+            logging.debug(e.strerror) 
+            sys.exit()
+
+        return config
 
     def main(self):
         while True:
@@ -133,15 +160,7 @@ class PypoFile(Thread):
 
                 media_item = self.get_highest_priority_media_item(self.media)
                 if media_item is not None:
-                    """
-                    If an object_name exists the file is stored on Amazon S3
-                    """
-                    if 'amazonS3_resource_id' in media_item:
-                        csd = CloudStorageDownloader()
-                        csd.download_obj(media_item['dst'], media_item['amazonS3_resource_id'])
-                        media_item['file_ready'] = True
-                    else:
-                        self.copy_file(media_item)
+                    self.copy_file(media_item)
             except Exception, e:
                 import traceback
                 top = traceback.format_exc()