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

airtime_mvc/application/controllers/LocaleController.php

@@ -158,6 +158,7 @@ class LocaleController extends Zend_Controller_Action
             "Copyright" => _("Copyright"),
             "All" => _("All"),
             "Copied %s row%s to the clipboard" => _("Copied %s row%s to the clipboard"),
+            "%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished." => _("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."),
             //preferences/musicdirs.js
             "Choose Storage Folder" => _("Choose Storage Folder"),
             "Choose Folder to Watch" => _("Choose Folder to Watch"),

airtime_mvc/public/js/airtime/playouthistory/historytable.js

@@ -111,7 +111,10 @@ var AIRTIME = (function(AIRTIME) {
                          "sExtends": "pdf",
                          "fnClick": setFlashFileName
                      },
-                     "print"
+                     {
+                         "sExtends": "print",
+                         "sInfo" : sprintf($.i18n._("%sPrint view%sPlease use your browser's print function to print this table. Press escape when finished."), "<h6>", "</h6><p>")
+                     }
                  ]
             }
         });

install_full/ubuntu/airtime-full-install-nginx

@@ -78,6 +78,10 @@ else
 	echo "NGINX config for Airtime already exists..."
 fi
 
+#Install Sourcefabric's custom Liquidsoap debian package
+apt-get -y --force-yes install sourcefabric-keyring
+apt-get -y --force-yes install liquidsoap
+
 # php-fpm Airtime pool file
 echo "----------------------------------------------------"
 echo "2.2 Airtime php pool file"