nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
ninadsp
2010-06-03 22:34:52 +05:30
parent 3bb4dbd0ac 5dfe98a378
commit 160f4314eb
120 changed files with 40225 additions and 32460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server_replication.php
View File

@@ -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');