From 032b3a193fd3f7cfedabe800aaecf57d42e28c8f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 26 Apr 2011 12:03:49 -0400 Subject: [PATCH 1/3] 3.4.0-rc2 --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index b928cb7dd..2732df737 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.0-rc2-dev - Documentation + phpMyAdmin 3.4.0-rc2 - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 3b3f355d2..835a0a53f 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.0-rc2-dev +Version 3.4.0-rc2 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 85fa390d4..b356d7e25 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.0-rc2-dev'); + $this->set('PMA_VERSION', '3.4.0-rc2'); /** * @deprecated */ From 7af7e26cfbf5f225ea4c47d06fe8433889f28211 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 26 Apr 2011 12:25:54 -0400 Subject: [PATCH 2/3] 3.4.0-rc3-dev --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 2732df737..aa3df7f7a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.0-rc2 - Documentation + phpMyAdmin 3.4.0-rc3-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 835a0a53f..1504628d2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.0-rc2 +Version 3.4.0-rc3-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index b356d7e25..04451ddd0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.0-rc2'); + $this->set('PMA_VERSION', '3.4.0-rc3-dev'); /** * @deprecated */ From fc4f0880865cda384087b666a24909d5ed111ce9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 26 Apr 2011 12:52:08 -0400 Subject: [PATCH 3/3] Separate tab/window for the page explaining how to contribute to translations --- main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.php b/main.php index a669480ce..96f3e01ee 100644 --- a/main.php +++ b/main.php @@ -351,7 +351,7 @@ if (file_exists('./libraries/language_stats.inc.php')) { * speaking users. */ if (isset($GLOBALS['language_stats'][$lang]) && $GLOBALS['language_stats'][$lang] < $cfg['TranslationWarningThreshold']) { - trigger_error('You are using an incomplete translation, please help to make it better by contributing.', E_USER_NOTICE); + trigger_error('You are using an incomplete translation, please help to make it better by contributing.', E_USER_NOTICE); } }