The branch, master has been updated
via 75bb94f923ab454fe0db509996793d0164c5e103 (commit)
from e386d589864d3ca346653429caddf24502526dc8 (commit)
- Log -----------------------------------------------------------------
commit 75bb94f923ab454fe0db509996793d0164c5e103
Author: Piotr Przybylski <[email protected]>
Date: Wed Jul 20 18:52:28 2011 +0200
Fix strings
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 2 +-
server_status.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 1345a8e..5b91d79 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -128,7 +128,7 @@ $js_messages['strEnableVar'] = __('Enable %s');
$js_messages['strDisableVar'] = __('Disable %s');
/* l10n: %d seconds */
$js_messages['setSetLongQueryTime'] = __('Set long_query_time to %ds');
-$js_messages['strNoSuperUser'] = __('You don\'t have super user rights to
change this variables. Please log in as root account or contact your database
administrator.');
+$js_messages['strNoSuperUser'] = __('You can\'t change these variables. Please
log in as root or contact your database administrator.');
$js_messages['strChangeSettings'] = __('Change settings');
$js_messages['strCurrentSettings'] = __('Current settings');
diff --git a/server_status.php b/server_status.php
index 2bdae64..a16896b 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1332,7 +1332,7 @@ function printMonitor() {
<div id="monitorInstructionsDialog" title="<?php echo __('Monitor
Instructions'); ?>" style="display:none;">
<?php echo __('The phpMyAdmin Monitor can assist you in optimizing the
server configuration and track down time intensive
- queries. For the latter you will need to log_output set to \'TABLE\'
and have either the slow_query_log or general_log enabled.'); ?>
+ queries. For the latter you will need to set log_output to \'TABLE\'
and have either the slow_query_log or general_log enabled.'); ?>
<p></p>
<img class="ajaxIcon" src="<?php echo $GLOBALS['pmaThemeImage'];
?>ajax_clock_small.gif" alt="Loading">
<div class="ajaxContent">
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
