diff --git a/ChangeLog b/ChangeLog
index c54b3dd81..bc0370e8e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-09-19  Marc Delisle  <lem9@users.sourceforge.net>
+        * tbl_properties.php3, db_details.php3, lang/*: start to merge new
+          messages with parameters
+
 2001-09-19  Loïc Chapeaux  <lolo@phpheaven.net>
 	* main.php3: merged patch #462787 (Home page for unpriviliged user) thanks
 	  to Piotr Roszatycki <d3xter at users.sourceforge.net>.
diff --git a/db_details.php3 b/db_details.php3
index da0f4857d..4ce6abdf8 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -178,12 +178,12 @@ else if (MYSQL_INT_VERSION >= 32300) {
             <?php echo $strProperties; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+        <a href="sql.php3?<?php echo $url_query; ?>&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
             onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
             <?php echo $strDrop; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenEmptied); ?>"
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); ?>"
             onclick="return confirmLink(this, 'DELETE FROM <?php echo js_format($table); ?>')">
             <?php echo $strEmpty; ?></a>
     </td>
@@ -343,10 +343,10 @@ else {
         <a href="tbl_properties.php3?<?php echo $url_query; ?>"><?php echo $strProperties; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($tables[$i])); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($tables[$i]) . ' ' . $strHasBeenDropped); ?>"><?php echo $strDrop; ?></a>
+        <a href="sql.php3?<?php echo $url_query; ?>&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($tables[$i])); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($tables[$i]))); ?>"><?php echo $strDrop; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($tables[$i])); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($tables[$i]) . ' ' . $strHasBeenEmptied); ?>"><?php echo $strEmpty; ?></a>
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($tables[$i])); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($tables[$i]))); ?>"><?php echo $strEmpty; ?></a>
     </td>
     <td align="right">
         <?php count_records($db, $tables[$i]); echo "\n"; ?>
@@ -427,7 +427,7 @@ if ($num_tables > 0) {
             <input type="hidden" name="goto" value="db_details.php3" />
             <input type="hidden" name="zero_rows" value="<?php echo htmlspecialchars($strSuccess); ?>" />
             <input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? urlencode($query_to_display) : ''); ?>" />
-            <?php echo $strRunSQLQuery . $db . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
+            <?php echo sprintf($strRunSQLQuery, $db) . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
 <textarea name="sql_query" cols="<?php echo $cfgTextareaCols; ?>" rows="<?php echo $cfgTextareaRows; ?>" wrap="virtual">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : ''); ?>
diff --git a/lang/english.inc.php3 b/lang/english.inc.php3
index af4b672ba..9f324de0d 100644
--- a/lang/english.inc.php3
+++ b/lang/english.inc.php3
@@ -31,14 +31,14 @@ $strAll = 'All';
 $strAlterOrderBy = 'Alter table order by';
 $strAnalyzeTable = 'Analyze table';
 $strAnd = 'And';
-$strAnIndex = 'An index has been added on ';
+$strAnIndex = 'An index has been added on %s';
 $strAny = 'Any';
 $strAnyColumn = 'Any Column';
 $strAnyDatabase = 'Any database';
 $strAnyHost = 'Any host';
 $strAnyTable = 'Any table';
 $strAnyUser = 'Any user';
-$strAPrimaryKey = 'A primary key has been added on ';
+$strAPrimaryKey = 'A primary key has been added on %s';
 $strAscending = 'Ascending';
 $strAtBeginningOfTable = 'At Beginning of Table';
 $strAtEndOfTable = 'At End of Table';
@@ -114,8 +114,12 @@ $strExtendedInserts = 'Extended inserts';
 $strExtra = 'Extra';
 
 $strField = 'Field';
+$strFieldHasBeenDropped = 'Field %s has been dropped';
 $strFields = 'Fields';
 $strFieldsEmpty = ' The field count is empty! ';
+$strFieldsEnclosedBy = 'Fields enclosed by';
+$strFieldsEscapedBy = 'Fields escaped by';
+$strFieldsTerminatedBy = 'Fields terminated by';
 $strFixed = 'fixed';
 $strFormat = 'Format';
 $strFormEmpty = 'Missing value in the form !';
@@ -140,6 +144,7 @@ $strHostEmpty = 'The host name is empty!';
 $strIdxFulltext = 'Fulltext';
 $strIfYouWish = 'If you wish to load only some of a table\'s columns, specify a comma separated field list.';
 $strIndex = 'Index';
+$strIndexHasBeenDropped = 'Index %s has been dropped';
 $strIndexes = 'Indexes';
 $strInsert = 'Insert';
 $strInsertAsNewRow = 'Insert as new row';
@@ -159,6 +164,7 @@ $strLengthSet = 'Length/Values*';
 $strLimitNumRows = 'records per page';
 $strLineFeed = 'Linefeed: \\n';
 $strLines = 'Lines';
+$strLinesTerminatedBy = 'Lines terminated by';
 $strLocationTextfile = 'Location of the textfile';
 $strLogin = ''; //to translate, but its not in use ...
 $strLogout = 'Log out';
@@ -188,7 +194,6 @@ $strNoUsersFound = 'No user(s) found.';
 $strNull = 'Null';
 $strNumberIndexes = ' Number of advanced indexes ';
 
-$strOffSet = 'Offset';
 $strOftenQuotation = 'Often quotation marks. OPTIONALLY means that only char and varchar fields are enclosed by the "enclosed by"-character.';
 $strOptimizeTable = 'Optimize table';
 $strOptionalControls = 'Optional. Controls how to write or read special characters.';
@@ -206,6 +211,7 @@ $strPos1 = 'Begin';
 $strPrevious = 'Previous';
 $strPrimary = 'Primary';
 $strPrimaryKey = 'Primary key';
+$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';
 $strPrinterFriendly = 'Printer friendly version of above table';
 $strPrintView = 'Print view';
 $strPrivileges = 'Privileges';
@@ -242,7 +248,7 @@ $strRowsStatistic = 'Row Statistic';
 $strRunning = 'running on ';
 $strRunningAs = 'as';
 $strRunQuery = 'Submit Query';
-$strRunSQLQuery = 'Run SQL query/queries on database ';
+$strRunSQLQuery = 'Run SQL query/queries on database %s';
 
 $strSave = 'Save';
 $strSelect = 'Select';
@@ -265,6 +271,7 @@ $strSize = 'Size';
 $strSort = 'Sort';
 $strSpaceUsage = 'Space usage';
 $strSQLQuery = 'SQL-query';
+$strStartingRecord = 'Starting record';
 $strStatement = 'Statements';
 $strStrucCSV = 'CSV data';
 $strStrucData = 'Structure and data';
@@ -278,6 +285,8 @@ $strSum = 'Sum';
 $strTable = 'table ';
 $strTableComments = 'Table comments';
 $strTableEmpty = 'The table name is empty!';
+$strTableHasBeenDropped = 'Table %s has been dropped';
+$strTableHasBeenEmptied = 'Table %s has been emptied';
 $strTableMaintenance = 'Table maintenance';
 $strTables = '%s table(s)';
 $strTableStructure = 'Table structure for table';
diff --git a/lang/french.inc.php3 b/lang/french.inc.php3
index 27841b323..2ed8731b2 100644
--- a/lang/french.inc.php3
+++ b/lang/french.inc.php3
@@ -31,14 +31,14 @@ $strAll = 'Tout';
 $strAlterOrderBy = '<b>Ordonner</b> la table par'; 
 $strAnalyzeTable = 'Analyser la table';
 $strAnd = 'et';
-$strAnIndex = 'Un index a été ajouté sur ';
+$strAnIndex = 'Un index a été ajouté sur %s';
 $strAny = 'N\'importe quel'; 
 $strAnyColumn = 'Toute colonne'; 
 $strAnyDatabase = 'Toute base de données'; 
 $strAnyHost = 'Tout serveur'; 
 $strAnyTable = 'Toute table'; 
 $strAnyUser = 'Tout utilisateur'; 
-$strAPrimaryKey = 'Une clé primaire a été ajoutée sur';
+$strAPrimaryKey = 'Une clé primaire a été ajoutée sur %s';
 $strAscending = 'Croissant';
 $strAtBeginningOfTable = 'En début de Table';
 $strAtEndOfTable = 'En fin de Table';
@@ -114,8 +114,12 @@ $strExtendedInserts = 'Insertions 
 $strExtra = 'Extra';
 
 $strField = 'Champ';
+$strFieldHasBeenDropped = 'Le champ %s a été effacé';
 $strFields = 'Champs';
 $strFieldsEmpty = 'Il faut indiquer le nombre de champs';
+$strFieldsEnclosedBy = 'Champs entourés par';
+$strFieldsEscapedBy = 'Caractère spécial';
+$strFieldsTerminatedBy = 'Champs terminés par';
 $strFixed = 'fixe'; 
 $strFormat = 'format'; 
 $strFormEmpty = 'Formulaire incomplet !';
@@ -141,6 +145,7 @@ $strIdxFulltext = 'Texte entier';
 $strIfYouWish = 'Si vous désirez ne charger que certaines colonnes, indiquez leurs noms, séparés par des virgules.';
 $strIndex = 'Index';
 $strIndexes = 'Index'; 
+$strIndexHasBeenDropped = 'L\'index %s a été effacé';
 $strInsert = 'Insérer';
 $strInsertAsNewRow = 'Insérer en tant que nouvel enregistrement';
 $strInsertedRows = 'Nombre d\'enregistrements insérés :';
@@ -158,6 +163,7 @@ $strLengthSet = 'Taille/Valeurs*';
 $strLimitNumRows = 'enregistrements par page';
 $strLineFeed = 'Saut de ligne : \\n';
 $strLines = 'Lignes';
+$strLinesTerminatedBy = 'Lignes terminées par';
 $strLocationTextfile = 'Emplacement du fichier texte';
 $strLogin = ''; //to translate, but its not in use ...
 $strLogout = 'Quitter';
@@ -187,7 +193,6 @@ $strNoUsersFound = 'Il n\'y a aucun utilisateur';
 $strNull = 'Null';
 $strNumberIndexes = ' Nombre d\'index spéciaux ';
 
-$strOffSet = 'début';
 $strOftenQuotation = 'Souvent des guillemets. OPTIONNEL signifie que seuls les champs de type char et varchar sont entourés par ce caractère.';
 $strOptimizeTable = 'Optimiser la table';
 $strOptionalControls = 'Optionnel. Indique le caractère qui permet d\'enlever l\'effet des caractères spéciaux.';
@@ -205,6 +210,7 @@ $strPos1 = 'D
 $strPrevious = 'Précédent';
 $strPrimary = 'Primaire';
 $strPrimaryKey = 'Clé primaire';
+$strPrimaryKeyHasBeenDropped = 'La clé primaire a été effacée';
 $strPrinterFriendly = 'Version imprimable de la table';
 $strPrintView = 'Version imprimable';
 $strPrivileges = 'Privilèges'; 
@@ -241,7 +247,7 @@ $strRowsStatistic = 'Statistiques';
 $strRunning = 'sur le serveur ';
 $strRunningAs = '- utilisateur&nbsp;:';
 $strRunQuery = 'Exécuter la requête';
-$strRunSQLQuery = 'Exécuter une ou des <b>requêtes</b> sur la base ';
+$strRunSQLQuery = 'Exécuter une ou des <b>requêtes</b> sur la base %s';
 
 $strSave = 'Sauvegarder';
 $strSelect = 'Sélectionner';
@@ -264,6 +270,7 @@ $strSize = 'Taille';
 $strSort = 'Tri';
 $strSpaceUsage = 'Espace utilisé'; 
 $strSQLQuery = 'requête SQL';
+$strStartingRecord = 'Premier enregistrement';
 $strStatement = 'Information';
 $strStrucCSV = 'Données CSV';
 $strStrucData = 'Structure et données';
@@ -277,6 +284,8 @@ $strSum = 'Somme';
 $strTable = 'table ';
 $strTableComments = 'Commentaires sur la table';
 $strTableEmpty = 'Le nom de la table est vide';
+$strTableHasBeenDropped = 'La table %s a été effacée';
+$strTableHasBeenEmptied = 'La table %s a été vidée';
 $strTableMaintenance = 'Maintenance de la table';
 $strTables = '%s table(s)';
 $strTableStructure = 'Structure de la table';
diff --git a/tbl_properties.php3 b/tbl_properties.php3
index 0937d113c..adef9a931 100755
--- a/tbl_properties.php3
+++ b/tbl_properties.php3
@@ -134,10 +134,10 @@ if ($num_rows > 0) {
         <b><?php echo $strSelect; ?></b></a> ]&nbsp;&nbsp;&nbsp;
     [ <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a> ]&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenEmptied); ?>"
+    [ <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DELETE FROM <?php echo js_format($table); ?>')">
          <b><?php echo $strEmpty; ?></b></a> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
          <b><?php echo $strDrop; ?></b></a> ]
 </p>
@@ -152,7 +152,7 @@ if ($num_rows > 0) {
     [ <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a> ]&nbsp;&nbsp;&nbsp;
     [ <b><?php echo $strEmpty; ?></b> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
          <b><?php echo $strDrop; ?></b></a> ]
 </p>
@@ -304,7 +304,7 @@ while ($row = mysql_fetch_array($result)) {
         if ($fields_cnt > 1) {
             echo "\n";
             ?>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' DROP ' . backquote($row['Field'])); ?>&zero_rows=<?php echo urlencode(htmlspecialchars($row['Field']) . ' ' . $strHasBeenDropped); ?>"
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' DROP ' . backquote($row['Field'])); ?>&zero_rows=<?php echo urlencode(sprintf($strFieldHasBeenDropped, htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo js_format($table); ?> DROP <?php echo js_format($row['Field']); ?>')">
             <?php echo $strDrop; ?></a>
             <?php
@@ -315,16 +315,16 @@ while ($row = mysql_fetch_array($result)) {
         ?>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode($strAPrimaryKey . ' ' . htmlspecialchars($row['Field'])); ?>"
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' DROP PRIMARY KEY, ADD PRIMARY KEY(' . $primary . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAPrimaryKey, htmlspecialchars($row['Field']))); ?>"
             onclick="return confirmLink(this, 'ALTER TABLE <?php echo js_format($table); ?> DROP PRIMARY KEY, ADD PRIMARY KEY(<?php echo js_format($row['Field']); ?>)')">
             <?php echo $strPrimary; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD INDEX(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode($strAnIndex . ' ' . htmlspecialchars($row['Field'])); ?>">
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD INDEX(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex ,htmlspecialchars($row['Field']))); ?>">
             <?php echo $strIndex; ?></a>
     </td>
     <td>
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD UNIQUE(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode($strAnIndex . ' ' . htmlspecialchars($row['Field'])); ?>">
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD UNIQUE(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
             <?php echo $strUnique; ?></a>
     </td>
     <?php
@@ -332,7 +332,7 @@ while ($row = mysql_fetch_array($result)) {
         echo "\n";
         ?>
     <td nowrap="nowrap">
-        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD FULLTEXT(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode($strAnIndex . ' ' . htmlspecialchars($row['Field'])); ?>">
+        <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . backquote($table) . ' ADD FULLTEXT(' . backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf($strAnIndex , htmlspecialchars($row['Field']))); ?>">
             <?php echo $strIdxFulltext; ?></a>
     </td>
         <?php
@@ -385,10 +385,10 @@ if ($fields_cnt > 20) {
         <b><?php echo $strSelect; ?></b></a> ]&nbsp;&nbsp;&nbsp;
     [ <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a> ]&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenEmptied); ?>"
+    [ <a href="sql.php3?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('DELETE FROM ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DELETE FROM <?php echo js_format($table); ?>')">
          <b><?php echo $strEmpty; ?></b></a> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
          <b><?php echo $strDrop; ?></b></a> ]
 </p>
@@ -403,7 +403,7 @@ if ($fields_cnt > 20) {
     [ <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a> ]&nbsp;&nbsp;&nbsp;
     [ <b><?php echo $strEmpty; ?></b> ]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+    [ <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
          onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
          <b><?php echo $strDrop; ?></b></a> ]
 </p>
@@ -463,11 +463,11 @@ if ($index_count > 0) {
         if ($row['Key_name'] == 'PRIMARY') {
             $sql_query = urlencode('ALTER TABLE ' . backquote($table) . ' DROP PRIMARY KEY');
             $js_msg    = 'ALTER TABLE ' . js_format($table) . ' DROP PRIMARY KEY';
-            $zero_rows = urlencode($strPrimaryKey . ' ' . $strHasBeenDropped);
+            $zero_rows = urlencode($strPrimaryKeyHasBeenDropped);
         } else {
             $sql_query = urlencode('ALTER TABLE ' . backquote($table) . ' DROP INDEX ' . backquote($row['Key_name']));
             $js_msg    = 'ALTER TABLE ' . js_format($table) . ' DROP INDEX ' . js_format($row['Key_name']);
-            $zero_rows = urlencode($strIndex . ' ' . htmlspecialchars($row['Key_name']) . ' ' . $strHasBeenDropped);
+            $zero_rows = urlencode(sprintf($strIndexHasBeenDropped, htmlspecialchars($row['Key_name'])));
         }
 
         if ($row['Key_name'] != $prev_key) {
@@ -738,7 +738,7 @@ echo "\n";
             <input type="hidden" name="goto" value="tbl_properties.php3" />
             <input type="hidden" name="zero_rows" value="<?php echo $strSuccess; ?>" />
             <input type="hidden" name="prev_sql_query" value="<?php echo ((!empty($query_to_display)) ? urlencode($query_to_display) : ''); ?>" />
-            <?php echo $strRunSQLQuery . htmlspecialchars($db) . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
+            <?php echo sprintf($strRunSQLQuery,  htmlspecialchars($db)) . ' ' . show_docu('manual_Reference.html#SELECT'); ?>&nbsp;:<br />
             <div style="margin-bottom: 5px">
 <textarea name="sql_query" rows="<?php echo $cfgTextareaRows; ?>" cols="<?php echo $cfgTextareaCols; ?>" wrap="virtual">
 <?php echo ((!empty($query_to_display)) ? htmlspecialchars($query_to_display) : 'SELECT * FROM ' . backquote($table) . ' WHERE 1'); ?>
@@ -853,13 +853,13 @@ echo "\n";
                     <?php echo $strStrucExcelCSV; ?>&nbsp;&nbsp;<br />
                     <input type="radio" name="what" value="csv" />
                     <?php echo $strStrucCSV;?>&nbsp;:<br />
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFields . ' '. $strTerminatedBy; ?>&nbsp;
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsTerminatedBy; ?>&nbsp;
                     <input type="text" name="separator" size="2" value=";" />&nbsp;&nbsp;<br />
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFields . ' '. $strEnclosedBy; ?>&nbsp;
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsEnclosedBy; ?>&nbsp;
                     <input type="text" name="enclosed" size="1" value="&quot;" />&nbsp;&nbsp;<br />
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFields . ' '. $strEscapedBy; ?>&nbsp;
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strFieldsEscapedBy; ?>&nbsp;
                     <input type="text" name="escaped" size="2" value="\" />&nbsp;&nbsp;<br />
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strLines . ' '. $strTerminatedBy; ?>&nbsp;
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $strLinesTerminatedBy; ?>&nbsp;
                     <input type="text" name="add_character" size="2" value="<?php echo ((which_crlf() == "\n") ? '\n' : '\r\n'); ?>" />&nbsp;&nbsp;
                 </td>
                 <td valign="middle">
@@ -909,7 +909,7 @@ echo "\n";
             </tr>
             <tr>
                 <td colspan="2">
-                    &nbsp;<?php echo $strData . '&nbsp;:&nbsp;' . $strOffSet; ?>&nbsp;
+                    &nbsp;<?php echo $strStartingRecord; ?>&nbsp;
                     <input type="text" name="limit_from" value="0" size="5" style="vertical-align: middle" />
                     &nbsp;--&nbsp;<?php echo $strNbRecords; ?>&nbsp;
                     <input type="text" name="limit_to" size="5" value="<?php echo count_records($db, $table, TRUE); ?>" style="vertical-align: middle" />
@@ -1162,7 +1162,7 @@ else { // MySQL < 3.23.22
 
     <!-- Deletes the table -->
     <li>
-        <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode($strTable . ' ' . htmlspecialchars($table) . ' ' . $strHasBeenDropped); ?>"
+        <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&back=tbl_properties.php3&reload=1&sql_query=<?php echo urlencode('DROP TABLE ' . backquote($table)); ?>&zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
             onclick="return confirmLink(this, 'DROP TABLE <?php echo js_format($table); ?>')">
             <?php echo $strDropTable . ' ' . htmlspecialchars($table); ?></a>
     </li>