From 35ba15219986dbf9ca64b4c84415a3ed4316b06d Mon Sep 17 00:00:00 2001
From: FramaJosephK <josephk@framasoft.org>
Date: Wed, 3 Dec 2014 14:30:25 +0100
Subject: [PATCH] =?UTF-8?q?Retouches=20apr=C3=A8s=20s=C3=A9rie=20de=20merg?=
 =?UTF-8?q?es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6751a8a9cfc84f2a49d46ccd2aec2ad0bcd72485)

Conflicts:
	adminstuds.php
	app/classes/Framadate/Utils.php
	creation_sondage.php
---
 app/classes/Framadate/Utils.php | 6 +++---
 install/error.html              | 4 ++--
 install/install.html            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php
index e515b76..94dfeeb 100644
--- a/app/classes/Framadate/Utils.php
+++ b/app/classes/Framadate/Utils.php
@@ -19,9 +19,9 @@
 namespace Framadate;
 
 class Utils {
-	/**
-	 * @return string Server name
-	 */
+    /**
+     * @return string Server name
+     */
     public static function get_server_name() {
         $scheme = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
         $port = in_array($_SERVER['SERVER_PORT'], [80, 443]) ? '' : ':' . $_SERVER['SERVER_PORT'];
diff --git a/install/error.html b/install/error.html
index a758055..c6dc5ba 100644
--- a/install/error.html
+++ b/install/error.html
@@ -12,13 +12,13 @@
         <div class="container ombre">
             <header role="banner">
                 <h1>
-                    <img src="../images/logo-framadate.png" width="360" height="50" alt="OpenSondage" />
+                    <img src="../images/logo-framadate.png" width="360" height="50" alt="Framadate" />
                 </h1>
                 <h2>Make your polls</h2>
                 <hr class="trait" role="presentation">
             </header>
             <main role="main">
-                <h3>OpenSondage Installation</h3>
+                <h3>Framadate Installation</h3>
                 <div class="alert alert-danger" role="alert">
                     <?php echo htmlspecialchars($e->getMessage(), ENT_COMPAT | ENT_HTML401, 'UTF-8') ?>
                 </div>
diff --git a/install/install.html b/install/install.html
index 004097a..1caa3af 100644
--- a/install/install.html
+++ b/install/install.html
@@ -12,13 +12,13 @@
         <div class="container ombre">
             <header role="banner">
                 <h1>
-                    <img src="../images/logo-framadate.png" width="360" height="50" alt="OpenSondage" />
+                    <img src="../images/logo-framadate.png" width="360" height="50" alt="Framadate" />
                 </h1>
                 <h2>Make your polls</h2>
                 <hr class="trait" role="presentation">
             </header>
             <main role="main">
-                <h3>OpenSondage Installation</h3>
+                <h3>Framadate Installation</h3>
                 <form action="" method="post" role="form">
                     <fieldset>
                         <legend>General</legend>