diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
index bf15c2cfd..63100499b 100644
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
@@ -3,17 +3,25 @@
 # This file is distributed under the same license as the Airtime package.
 #
 # Translators:
+# AlbertFR <albert.bruc.ab@gmail.com>, 2014
 # Sourcefabric <contact@sourcefabric.org>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Airtime\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2014-07-25 14:36-0400\n"
 "PO-Revision-Date: 2014-01-29 15:10+0000\n"
 "Last-Translator: andrey.podshivalov\n"
 "Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/"
 "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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2495,10 +2503,15 @@ msgstr "Editeur de Point d'E/S"
 
 #: airtime_mvc/application/controllers/LocaleController.php:289
 msgid ""
+<<<<<<< HEAD
 "Waveform features are available in a browser supporting the Web Audio API"
 msgstr ""
 "Les caractéristiques de la forme d'onde sont disponibles dans un navigateur "
 "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
 msgid "Select all"
diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install
index c2b414bb7..2a2fa824c 100755
--- a/install_full/ubuntu/airtime-full-install
+++ b/install_full/ubuntu/airtime-full-install
@@ -132,6 +132,7 @@ else
     echo "----------------------------------------------------"
     echo "2.1 Apache Config File"
     echo "----------------------------------------------------"
+
     if [ "$apacheversion" != "1" ]; then
 	airtimeconfigfile="airtime.conf"
     else
diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 63ab79f1e..6e429d6ac 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -177,6 +177,7 @@ class AirtimeInstall
             }
 
             echo "* Giving Apache permission to access $rp".PHP_EOL;
+            $success = chown($rp, $CC_CONFIG["webServerUser"]);
             $success = chgrp($rp, $CC_CONFIG["webServerUser"]);
             $success = chmod($rp, 0775);
         }