The branch, master has been updated
via ff7792c82aa4e53b0ea993dcc8f910731690cfec (commit)
via 57e0b321f1b33139fdeaf6e59f64dd7cca0c5705 (commit)
from c3863f039587334ccc26c40bb90b45f70d210bbb (commit)
- Log -----------------------------------------------------------------
commit ff7792c82aa4e53b0ea993dcc8f910731690cfec
Merge: 57e0b321f1b33139fdeaf6e59f64dd7cca0c5705
c3863f039587334ccc26c40bb90b45f70d210bbb
Author: Marc Delisle <[email protected]>
Date: Sun Jul 24 14:42:11 2011 -0400
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 57e0b321f1b33139fdeaf6e59f64dd7cca0c5705
Author: Marc Delisle <[email protected]>
Date: Sun Jul 24 14:41:46 2011 -0400
Typos
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 4cfa7e7..3d41b87 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -111,10 +111,10 @@ $js_messages['strNone'] = __('None');
$js_messages['strResumeMonitor'] = __('Resume monitor');
$js_messages['strPauseMonitor'] = __('Pause monitor');
/* Monitor: Instructions Dialog */
-$js_messages['strBothLogOn'] = __('general_log and slow_query_log is
enabled.');
+$js_messages['strBothLogOn'] = __('general_log and slow_query_log are
enabled.');
$js_messages['strGenLogOn'] = __('general_log is enabled.');
$js_messages['strSlowLogOn'] = __('slow_query_log is enabled.');
-$js_messages['strBothLogOff'] = __('slow_query_log and general_log is
disabled.');
+$js_messages['strBothLogOff'] = __('slow_query_log and general_log are
disabled.');
$js_messages['strLogOutNotTable'] = __('log_output is not set to TABLE.');
$js_messages['strLogOutIsTable'] = __('log_output is set to TABLE.');
$js_messages['strSmallerLongQueryTimeAdvice'] = __('slow_query_log is enabled,
but the server logs only queries that take longer than %d seconds. It is
advisable to set this long_query_time 0-2 seconds, depending on your system.');
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
