strings to gettext, second batch

1 files changed, 41 insertions, 41 deletions

diff --git a/server_replication.php b/server_replication.php
index 9eb53679be..264e068d88 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -30,7 +30,7 @@ if (! $is_superuser) {
     require './libraries/server_links.inc.php';
     echo '<h2>' . "\n"
         . PMA_getIcon('s_replication.png')
-        . $GLOBALS['strReplication'] . "\n"
+        . __('Replication') . "\n"
         . '</h2>' . "\n";
     PMA_Message::error('strNoPrivileges')->display();
     require_once './libraries/footer.inc.php';
@@ -55,23 +55,23 @@ if (isset($GLOBALS['sr_take_action'])) {
 
         if (! $link_to_master) {
             $_SESSION['replication']['sr_action_status'] = 'error';
-            $_SESSION['replication']['sr_action_info'] = sprintf($GLOBALS['strReplicationErrorMasterConnect'], $sr['hostname']);
+            $_SESSION['replication']['sr_action_info'] = sprintf(__('Unable to connect to master %s.'), $sr['hostname']);
         } else {
             // Read the current master position
             $position = PMA_replication_slave_bin_log_master($link_to_master);
 
             if (empty($position)) {
                 $_SESSION['replication']['sr_action_status'] = 'error';
-                $_SESSION['replication']['sr_action_info'] = $GLOBALS['strReplicationErrorGetPosition'];
+                $_SESSION['replication']['sr_action_info'] = __('Unable to read master log position. Possible privilege problem on master.');
             } else {
                 $_SESSION['replication']['m_correct']  = true;
 
                 if (! PMA_replication_slave_change_master($sr['username'], $sr['pma_pw'], $sr['hostname'], $sr['port'], $position, true, false)) {
                     $_SESSION['replication']['sr_action_status'] = 'error';
-                    $_SESSION['replication']['sr_action_info'] = $GLOBALS['strReplicationUnableToChange'];
+                    $_SESSION['replication']['sr_action_info'] = __('Unable to change master');
                 } else {
                     $_SESSION['replication']['sr_action_status'] = 'success';
-                    $_SESSION['replication']['sr_action_info'] = sprintf($GLOBALS['strReplicationChangedSuccesfully'], $sr['hostname']);
+                    $_SESSION['replication']['sr_action_info'] = sprintf(__('Master server changed succesfully to %s'), $sr['hostname']);
                 }
             }
         }
@@ -161,7 +161,7 @@ require './libraries/server_links.inc.php';
 echo '<div id="replication">';
 echo ' <h2>';
 echo '   <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_replication.png"  width="16" height="16" alt="" />';
-echo     $GLOBALS['strReplication'];
+echo     __('Replication');
 echo ' </h2>';
 
 // Display error messages
@@ -178,20 +178,20 @@ if (isset($_SESSION['replication']['sr_action_status']) && isset($_SESSION['repl
 if ($server_master_status) {
     if (! isset($GLOBALS['repl_clear_scr'])) {
         echo '<fieldset>';
-        echo '<legend>' . $GLOBALS['strReplicationMaster'] . '</legend>';
-        echo $GLOBALS['strReplicationConfiguredMaster'];
+        echo '<legend>' . __('Master replication') . '</legend>';
+        echo __('This server is configured as master in a replication process.');
         echo '<ul>';
-        echo '  <li><a href="#" id="master_status_href">' . $GLOBALS['strReplicationShowMasterStatus'] . '</a></li>';
+        echo '  <li><a href="#" id="master_status_href">' . __('Show master status') . '</a></li>';
         PMA_replication_print_status_table('master', true, false);
 
-        echo '  <li><a href="#" id="master_slaves_href">' . $GLOBALS['strReplicationShowConnectedSlaves'] . '</a></li>';
+        echo '  <li><a href="#" id="master_slaves_href">' . __('Show connected slaves') . '</a></li>';
         PMA_replication_print_slaves_table(true);
 
         $_url_params = $GLOBALS['url_params'];
         $_url_params['mr_adduser'] = true;
         $_url_params['repl_clear_scr'] = true;
 
-        echo '  <li><a href="' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">' . $GLOBALS['strReplicationAddSlaveUser'] . '</a></li>';
+        echo '  <li><a href="' . PMA_generate_common_url($_url_params) . '" id="master_addslaveuser_href">' . __('Add slave replication user') . '</a></li>';
     }
 
     // Display 'Add replication slave user' form
@@ -206,33 +206,33 @@ if ($server_master_status) {
     $_url_params['mr_configure'] = true;
 
     echo '<fieldset>';
-    echo '<legend>' . $GLOBALS['strReplicationMaster'] . '</legend>';
-    echo sprintf($GLOBALS['strReplicationServernConfiguredMaster'], PMA_generate_common_url($_url_params));
+    echo '<legend>' . __('Master replication') . '</legend>';
+    echo sprintf(__('This server is not configured as master in a replication process. Would you like to <a href=%s>configure</a> it?'), PMA_generate_common_url($_url_params));
     echo '</fieldset>';
 }
 
 if (isset($GLOBALS['mr_configure'])) {
     // Render the 'Master configuration' section
     echo '<fieldset>';
-    echo '<legend>' . $GLOBALS['strReplicationMasterConfiguration'] . '</legend>';
-    echo $GLOBALS['strReplicationMasterChooseMode'] . '<br /><br />';
+    echo '<legend>' . __('Master configuration') . '</legend>';
+    echo __('This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:') . '<br /><br />';
 
     echo '<select name="db_type" id="db_type">';
-    echo '<option value="all">' . $GLOBALS['strReplicationMasterChooseAll'] . '</option>';
-    echo '<option value="ign">' . $GLOBALS['strReplicationMasterChooseIgn'] . '</option>';
+    echo '<option value="all">' . __('Replicate all databases; Ignore:') . '</option>';
+    echo '<option value="ign">' . __('Ignore all databases; Replicate:') . '</option>';
     echo '</select>';
     echo '<br /><br />';
-    echo $GLOBALS['strReplicationSelectDatabases'] . '<br />';
+    echo __('Please select databases:') . '<br />';
     echo PMA_replication_db_multibox();
     echo '<br /><br />';
-    echo $GLOBALS['strReplicationAddLines'] . '<br />';
+    echo __('Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.') . '<br />';
     echo '<pre id="rep"></pre>';
-    echo $GLOBALS['strReplicationRestartServer'];
+    echo __('Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server <b>is</b> configured as master');
     echo '</fieldset>';
     echo '<fieldset class="tblFooters">';
     echo ' <form method="post" action="server_replication.php" >';
     echo PMA_generate_common_hidden_inputs('', '');
-    echo '  <input type="submit" value="' . $GLOBALS['strGo'] . '" id="goButton" />';
+    echo '  <input type="submit" value="' . __('Go') . '" id="goButton" />';
     echo ' </form>';
     echo '</fieldset>';
 
@@ -245,7 +245,7 @@ echo '</div>';
 if (! isset($GLOBALS['repl_clear_scr'])) {
     // Render the 'Slave configuration' section
     echo '<fieldset>';
-    echo '<legend>' . $GLOBALS['strReplicationSlave'] . '</legend>';
+    echo '<legend>' . __('Slave replication') . '</legend>';
     if ($server_slave_status) {
         echo '<div id="slave_configuration_gui">';
 
@@ -302,49 +302,49 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
 
         $reconfiguremaster_link = PMA_generate_common_url($_url_params);
 
-        echo $GLOBALS['strReplicationSlaveConfigured'];
+        echo __('Server is configured as slave in a replication process. Would you like to:');
         echo '<br />';
         echo '<ul>';
-        echo ' <li><a href="#" id="slave_status_href">' . $GLOBALS['strReplicationSlaveSeeStatus'] . '</a></li>';
+        echo ' <li><a href="#" id="slave_status_href">' . __('See slave status table') . '</a></li>';
         echo PMA_replication_print_status_table('slave', true, false);
         if (isset($_SESSION['replication']['m_correct']) && $_SESSION['replication']['m_correct'] == true) {
-            echo ' <li><a href="#" id="slave_synchronization_href">' . $GLOBALS['strReplicationSynchronize'] . '</a></li>';
+            echo ' <li><a href="#" id="slave_synchronization_href">' . __('Synchronize databases with master') . '</a></li>';
             echo ' <div id="slave_synchronization_gui" style="display: none">';
             echo '  <form method="post" action="server_replication.php">';
             echo PMA_generate_common_hidden_inputs('', '');
-            echo '   <input type="checkbox" name="repl_struc" value="1" checked="checked" disabled="disabled" /> ' . $GLOBALS['strStructure'] . '<br />'; // this is just for vizualization, it has no other purpose
-            echo '   <input type="checkbox" name="repl_data"  value="1" checked="checked" /> ' . $GLOBALS['strData'] .' <br />';
+            echo '   <input type="checkbox" name="repl_struc" value="1" checked="checked" disabled="disabled" /> ' . __('Structure') . '<br />'; // this is just for vizualization, it has no other purpose
+            echo '   <input type="checkbox" name="repl_data"  value="1" checked="checked" /> ' . __('Data') .' <br />';
             echo '   <input type="hidden" name="sr_take_action" value="1" />';
-            echo '   <input type="submit" name="sl_sync" value="' . $GLOBALS['strGo'] . '" />';
+            echo '   <input type="submit" name="sl_sync" value="' . __('Go') . '" />';
             echo '  </form>';
             echo ' </div>';
         }
-        echo ' <li><a href="#" id="slave_control_href">' . $GLOBALS['strReplicationControlSlave'] . '</a>';
+        echo ' <li><a href="#" id="slave_control_href">' . __('Control slave:') . '</a>';
         echo ' <div id="slave_control_gui" style="display: none">';
         echo '  <ul>';
-        echo '   <li><a href="'. $slave_control_full_link . '">' . (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? $GLOBALS['strFullStart'] : $GLOBALS['strFullStop']) . ' </a></li>';
-        echo '   <li><a href="'. $slave_control_reset_link . '">' . $GLOBALS['strReplicationSlaveReset'] . '</a></li>';
-        echo '   <li><a href="' . $slave_control_sql_link . '">' . sprintf($GLOBALS['strReplicationSlaveSQLThread'], ($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) . '</a></li>';
-        echo '   <li><a href="' . $slave_control_io_link . '">' . sprintf($GLOBALS['strReplicationSlaveIOThread'], ($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? $GLOBALS['strStart'] : $GLOBALS['strStop'])) . '</a></li>';
+        echo '   <li><a href="'. $slave_control_full_link . '">' . (($server_slave_replication[0]['Slave_IO_Running'] == 'No' || $server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? __('Full start') : __('Full stop')) . ' </a></li>';
+        echo '   <li><a href="'. $slave_control_reset_link . '">' . __('Reset slave') . '</a></li>';
+        echo '   <li><a href="' . $slave_control_sql_link . '">' . sprintf(__('SQL Thread %s only'), ($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? __('Start') : __('Stop'))) . '</a></li>';
+        echo '   <li><a href="' . $slave_control_io_link . '">' . sprintf(__('IO Thread %s only'), ($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? __('Start') : __('Stop'))) . '</a></li>';
         echo '  </ul>';
         echo ' </div>';
         echo ' </li>';
-        echo ' <li><a href="#" id="slave_errormanagement_href">' . $GLOBALS['strReplicationSlaveErrorManagement'] . '</a>';
+        echo ' <li><a href="#" id="slave_errormanagement_href">' . __('Error management:') . '</a>';
         echo ' <div id="slave_errormanagement_gui" style="display: none">';
-        PMA_Message::warning($GLOBALS['strReplicationSkippingErrorWarn'])->display();
+        PMA_Message::warning(__('Skipping error(s) might lead into unsynchronized master and slave!'))->display();
         echo '  <ul>';
-        echo '   <li><a href="' . $slave_skip_error_link . '">' . $GLOBALS['strReplicationSlaveSkipCurrentError'] . '</a></li>';
-        echo '   <li>' . $GLOBALS['strReplicationSlaveSkipNext'];
+        echo '   <li><a href="' . $slave_skip_error_link . '">' . __('Skip current error') . '</a></li>';
+        echo '   <li>' . __('Skip next');
         echo '    <form method="post" action="server_replication.php">';
         echo PMA_generate_common_hidden_inputs('', '');
-        echo '      <input type="text" name="sr_skip_errors_count" value="1" style="width: 30px" />' . $GLOBALS['strReplicationSlaveSkipNextErrors'];
-        echo '              <input type="submit" name="sr_slave_skip_error" value="' . $GLOBALS['strGo'] . '" />';
+        echo '      <input type="text" name="sr_skip_errors_count" value="1" style="width: 30px" />' . __('errors.');
+        echo '              <input type="submit" name="sr_slave_skip_error" value="' . __('Go') . '" />';
         echo '      <input type="hidden" name="sr_take_action" value="1" />';
         echo '    </form></li>';
         echo '  </ul>';
         echo ' </div>';
         echo ' </li>';
-        echo ' <li><a href="' . $reconfiguremaster_link . '">' . $GLOBALS['strReplicationSlaveChangeMaster'] . '</a></li>';
+        echo ' <li><a href="' . $reconfiguremaster_link . '">' . __('Change or reconfigure master server') . '</a></li>';
         echo '</ul>';
 
     } elseif (! isset($GLOBALS['sl_configure'])) {
@@ -352,7 +352,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
         $_url_params['sl_configure'] = true;
         $_url_params['repl_clear_scr'] = true;
 
-        echo sprintf($GLOBALS['strReplicationSlaveNotConfigured'], PMA_generate_common_url($_url_params));
+        echo sprintf(__('This server is not configured as slave in a replication process. Would you like to <a href=%s>configure</a> it?'), PMA_generate_common_url($_url_params));
     }
     echo '</div>';
     echo '</fieldset>';