From 0b510fb3cc2636d3525522c499769e56040045a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 16 Nov 2016 16:11:47 +0100
Subject: [PATCH 1/2] Simplify PHP 7.1 test setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml         | 2 +-
 test/install-runkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6577fca01d..77e5ca62dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@
 language: php
 
 php:
-  - "7.1.0RC3"
+  - "7.1"
   - "7.0"
   - "5.6"
   - "5.5"
diff --git a/test/install-runkit b/test/install-runkit
index a0a1863656..eea1247e5f 100755
--- a/test/install-runkit
+++ b/test/install-runkit
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1.0RC3" ] ; then
+if [ "$TRAVIS_PHP_VERSION" = "nightly" -o "$TRAVIS_PHP_VERSION" = "hhvm" -o "$TRAVIS_PHP_VERSION" = "7.0" -o "$TRAVIS_PHP_VERSION" = "7.1" ] ; then
     exit 0
 fi
 

From 4eb366ff0213a7802195e0c351d9e2927d50393e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 16 Nov 2016 13:27:12 +0000
Subject: [PATCH 2/2] Translated using Weblate (French)

Currently translated at 99.1% (3206 of 3232 strings)

[CI skip]
---
 po/fr.po | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 721562ba99..5d77a69066 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-11-10 09:40+0100\n"
-"PO-Revision-Date: 2016-11-14 14:22+0000\n"
+"PO-Revision-Date: 2016-11-16 13:27+0000\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
@@ -3300,10 +3300,8 @@ msgid "Details…"
 msgstr "Détails…"
 
 #: libraries/DatabaseInterface.php:2326
-#, fuzzy
-#| msgid "Missing parameter:"
 msgid "Missing connection parameters!"
-msgstr "Paramètre manquant : "
+msgstr "Paramètres de connexion manquants !"
 
 #: libraries/DatabaseInterface.php:2350
 msgid "Connection for controluser as defined in your configuration failed."
@@ -3623,9 +3621,8 @@ msgid "Hide browser transformation"
 msgstr "Masquer les transformations"
 
 #: libraries/DisplayResults.php:1800
-#, fuzzy
 msgid "Well Known Text"
-msgstr "Texte très connu"
+msgstr "Well Known Text"
 
 #: libraries/DisplayResults.php:1801
 msgid "Well Known Binary"