From 7ab576930ba6cd844c3bbffa6161b8b4669b969c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 9 Sep 2015 06:03:45 -0400 Subject: [PATCH 1/2] 4.5.0-rc1 Signed-off-by: Marc Delisle --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index e3786bce91..6593ee1909 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.5.0-beta2 +Version 4.5.0-rc1 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index af5a2f24dc..246fd922ce 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.5.0-beta2' +version = '4.5.0-rc1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 58cd87d215..f4eb8800ae 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.5.0-beta2'); + $this->set('PMA_VERSION', '4.5.0-rc1'); /** * @deprecated */ From ae77949f399d1d383b44a9823d68f71d1dab8986 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 10 Sep 2015 18:10:07 -0400 Subject: [PATCH 2/2] Fixes #11472 Tiny translation issue in French Signed-off-by: Marc Delisle --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 3eabf80063..3454142464 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10044,7 +10044,7 @@ msgstr "Aller à la table copiée" #: libraries/operations.lib.php:1370 #: templates/database/structure/check_all_tables.phtml:18 msgid "Table maintenance" -msgstr "Maintenance de la table" +msgstr "Maintenance de la table" #: libraries/operations.lib.php:1408 #: templates/database/structure/check_all_tables.phtml:19