diff options
author | ninadsp <ninadsp16289@gmail.com> | 2010-06-03 21:04:52 +0400 |
---|---|---|
committer | ninadsp <ninadsp16289@gmail.com> | 2010-06-03 21:04:52 +0400 |
commit | 160f4314eb518afcc1eba80da9575657584b2e34 (patch) | |
tree | 6678e9fb54d748f31ce8d5bbdd87286e693b16e5 /server_replication.php | |
parent | 3bb4dbd0acc962969000cd2d0dab230d858dc28c (diff) | |
parent | 5dfe98a3786c7aaf55c9dd677da81bfe509c8612 (diff) |
Merge remote branch 'origin/master'
Diffstat (limited to 'server_replication.php')
-rwxr-xr-x | server_replication.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server_replication.php b/server_replication.php index 9a7f0ddd74..dae375adbd 100755 --- a/server_replication.php +++ b/server_replication.php @@ -331,7 +331,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) { echo ' </li>'; echo ' <li><a href="#" id="slave_errormanagement_href">' . __('Error management:') . '</a>'; echo ' <div id="slave_errormanagement_gui" style="display: none">'; - PMA_Message::warning(__('Skipping error(s) might lead into unsynchronized master and slave!'))->display(); + PMA_Message::warning(__('Skipping errors might lead into unsynchronized master and slave!'))->display(); echo ' <ul>'; echo ' <li><a href="' . $slave_skip_error_link . '">' . __('Skip current error') . '</a></li>'; echo ' <li>' . __('Skip next'); |