Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged 2.5.x into saas

This commit is contained in:
Duncan Sommerville 2014-09-17 13:30:37 -04:00
parent 0cb6e27306 0c538ff1ae
commit 63d1bf08f7
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
View File

@ -3,17 +3,25 @@
# This file is distributed under the same license as the Airtime package. # This file is distributed under the same license as the Airtime package.
# #
# Translators: # Translators:
# AlbertFR <albert.bruc.ab@gmail.com>, 2014
# Sourcefabric <contact@sourcefabric.org>, 2012 # Sourcefabric <contact@sourcefabric.org>, 2012
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Airtime\n" "Project-Id-Version: Airtime\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2014-07-25 14:36-0400\n" "POT-Creation-Date: 2014-07-25 14:36-0400\n"
"PO-Revision-Date: 2014-01-29 15:10+0000\n" "PO-Revision-Date: 2014-01-29 15:10+0000\n"
"Last-Translator: andrey.podshivalov\n" "Last-Translator: andrey.podshivalov\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/" "Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/"
"language/fr_FR/)\n" "language/fr_FR/)\n"
"Language: fr_FR\n" "Language: fr_FR\n"
=======
"POT-Creation-Date: 2013-12-13 12:58-0500\n"
"PO-Revision-Date: 2014-09-11 09:33+0000\n"
"Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
>>>>>>> 2.5.x
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
@ -2495,10 +2503,15 @@ msgstr "Editeur de Point d'E/S"
#: airtime_mvc/application/controllers/LocaleController.php:289 #: airtime_mvc/application/controllers/LocaleController.php:289
msgid "" msgid ""
<<<<<<< HEAD
"Waveform features are available in a browser supporting the Web Audio API" "Waveform features are available in a browser supporting the Web Audio API"
msgstr "" msgstr ""
"Les caractéristiques de la forme d'onde sont disponibles dans un navigateur " "Les caractéristiques de la forme d'onde sont disponibles dans un navigateur "
"supportant l'API Web Audio" "supportant l'API Web Audio"
=======
"Warning: You cannot change this field while the show is currently playing"
msgstr "Attention: Vous ne pouvez pas modifier ce champ alors que l'émission est en cours de lecture"
>>>>>>> 2.5.x
#: airtime_mvc/application/controllers/LocaleController.php:292 #: airtime_mvc/application/controllers/LocaleController.php:292
msgid "Select all" msgid "Select all"

1
install_full/ubuntu/airtime-full-install
View File

@ -132,6 +132,7 @@ else
echo "----------------------------------------------------" echo "----------------------------------------------------"
echo "2.1 Apache Config File" echo "2.1 Apache Config File"
echo "----------------------------------------------------" echo "----------------------------------------------------"
if [ "$apacheversion" != "1" ]; then if [ "$apacheversion" != "1" ]; then
airtimeconfigfile="airtime.conf" airtimeconfigfile="airtime.conf"
else else

1
install_minimal/include/AirtimeInstall.php
View File

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