From ccb62f3234c1b8d6cc2e4cdff15fef7ed8237e47 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Tue, 6 Aug 2002 21:04:02 +0000
Subject: [PATCH] Fixed bug #590863 (Importing an SQL dump fails when using
 UTF-8) by allowing the user to specify the charset of an uploaded SQL file.

---
 ChangeLog                                     |  3 +
 db_details.php3                               | 22 +++++++-
 lang/afrikaans-iso-8859-1.inc.php3            |  1 +
 lang/afrikaans-utf-8.inc.php3                 |  1 +
 lang/albanian-iso-8859-1.inc.php3             |  1 +
 lang/albanian-utf-8.inc.php3                  |  1 +
 lang/arabic-utf-8.inc.php3                    |  1 +
 lang/arabic-windows-1256.inc.php3             |  1 +
 lang/brazilian_portuguese-iso-8859-1.inc.php3 |  1 +
 lang/brazilian_portuguese-utf-8.inc.php3      |  1 +
 lang/bulgarian-koi8-r.inc.php3                |  1 +
 lang/bulgarian-utf-8.inc.php3                 |  1 +
 lang/bulgarian-windows-1251.inc.php3          |  1 +
 lang/catalan-iso-8859-1.inc.php3              |  1 +
 lang/catalan-utf-8.inc.php3                   |  1 +
 lang/chinese_big5-utf-8.inc.php3              |  1 +
 lang/chinese_big5.inc.php3                    |  1 +
 lang/chinese_gb-utf-8.inc.php3                |  1 +
 lang/chinese_gb.inc.php3                      |  1 +
 lang/croatian-iso-8859-2.inc.php3             |  1 +
 lang/croatian-utf-8.inc.php3                  |  1 +
 lang/croatian-windows-1250.inc.php3           |  1 +
 lang/czech-iso-8859-2.inc.php3                |  1 +
 lang/czech-utf-8.inc.php3                     |  1 +
 lang/czech-windows-1250.inc.php3              |  1 +
 lang/danish-iso-8859-1.inc.php3               |  1 +
 lang/danish-utf-8.inc.php3                    |  1 +
 lang/dutch-iso-8859-1.inc.php3                |  3 +-
 lang/dutch-utf-8.inc.php3                     |  3 +-
 lang/english-iso-8859-1.inc.php3              |  3 +
 lang/english-utf-8.inc.php3                   |  4 ++
 lang/estonian-iso-8859-1.inc.php3             | 19 ++++---
 lang/estonian-utf-8.inc.php3                  | 19 ++++---
 lang/finnish-iso-8859-1.inc.php3              |  1 +
 lang/finnish-utf-8.inc.php3                   |  1 +
 lang/french-iso-8859-1.inc.php3               |  1 +
 lang/french-utf-8.inc.php3                    |  1 +
 lang/galician-iso-8859-1.inc.php3             | 17 +++---
 lang/galician-utf-8.inc.php3                  | 17 +++---
 lang/georgian-utf-8.inc.php3                  |  3 +-
 lang/german-iso-8859-1.inc.php3               |  1 +
 lang/german-utf-8.inc.php3                    |  1 +
 lang/greek-iso-8859-7.inc.php3                |  1 +
 lang/greek-utf-8.inc.php3                     |  1 +
 lang/hebrew-iso-8859-8-i.inc.php3             | 49 +++++++++--------
 lang/hungarian-iso-8859-2.inc.php3            | 13 +++--
 lang/hungarian-utf-8.inc.php3                 | 13 +++--
 lang/indonesian-iso-8859-1.inc.php3           |  1 +
 lang/indonesian-utf-8.inc.php3                |  1 +
 lang/italian-iso-8859-1.inc.php3              |  1 +
 lang/italian-utf-8.inc.php3                   |  1 +
 lang/japanese-euc.inc.php3                    |  1 +
 lang/japanese-sjis.inc.php3                   |  1 +
 lang/japanese-utf-8.inc.php3                  |  1 +
 lang/korean-ks_c_5601-1987.inc.php3           |  1 +
 lang/latvian-utf-8.inc.php3                   |  1 +
 lang/latvian-windows-1257.inc.php3            |  1 +
 lang/lithuanian-utf-8.inc.php3                |  1 +
 lang/lithuanian-windows-1257.inc.php3         |  1 +
 lang/norwegian-iso-8859-1.inc.php3            |  5 +-
 lang/norwegian-utf-8.inc.php3                 |  5 +-
 lang/polish-iso-8859-2.inc.php3               |  1 +
 lang/polish-utf-8.inc.php3                    |  1 +
 lang/portuguese-iso-8859-1.inc.php3           | 55 ++++++++++---------
 lang/portuguese-utf-8.inc.php3                | 55 ++++++++++---------
 lang/romanian-iso-8859-1.inc.php3             |  1 +
 lang/russian-koi8-r.inc.php3                  |  1 +
 lang/russian-utf-8.inc.php3                   |  1 +
 lang/russian-windows-1251.inc.php3            |  1 +
 lang/serbian-utf-8.inc.php3                   |  1 +
 lang/serbian-windows-1250.inc.php3            |  1 +
 lang/slovak-iso-8859-2.inc.php3               |  1 +
 lang/slovak-utf-8.inc.php3                    |  1 +
 lang/slovak-windows-1250.inc.php3             |  1 +
 lang/slovenian-iso-8859-2.inc.php3            |  1 +
 lang/slovenian-utf-8.inc.php3                 |  1 +
 lang/slovenian-windows-1250.inc.php3          |  1 +
 lang/spanish-iso-8859-1.inc.php3              | 15 ++---
 lang/spanish-utf-8.inc.php3                   | 15 ++---
 lang/swedish-iso-8859-1.inc.php3              |  1 +
 lang/swedish-utf-8.inc.php3                   |  1 +
 lang/thai-tis-620.inc.php3                    |  3 +-
 lang/thai-utf-8.inc.php3                      |  3 +-
 lang/turkish-iso-8859-9.inc.php3              | 31 ++++++-----
 lang/turkish-utf-8.inc.php3                   | 31 ++++++-----
 lang/ukrainian-utf-8.inc.php3                 |  1 +
 lang/ukrainian-windows-1251.inc.php3          |  1 +
 read_dump.php3                                |  4 ++
 tbl_query_box.php3                            | 20 +++++++
 89 files changed, 315 insertions(+), 178 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b5174cd8..b4fe25d57 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@ $Source$
 
 2002-08-06 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/english-*.inc.php3: Typo.
+    * db_details.php3, read_dump.php3, tbl_query_box.php3, lang/*.inc.php3:
+      Fixed bug #590863 (Importing an SQL dump fails when using UTF-8) by
+      allowing the user to specify the charset of an uploaded SQL file.
 
 2002-08-05 Loïc Chapeaux  <lolo@phpheaven.net>
     * tbl_indexes.php3, ldi_check.php3, libraries/sqlparser.lib.php3:
diff --git a/db_details.php3 b/db_details.php3
index 7d220d1ff..dd3b51ce0 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -35,7 +35,7 @@ if (isset($show_query) && $show_query == '1') {
 $sub_part    = '';
 require('./db_details_db_info.php3');
 if ($num_tables == 0 && empty($db_query_force)) {
-	$is_info = TRUE;
+    $is_info = TRUE;
     include('./db_details_structure.php3');
     exit();
 }
@@ -75,6 +75,26 @@ if ($is_upload) {
     ?>
     <div style="margin-bottom: 5px">
         <input type="file" name="sql_file" class="textfield" /><br />
+<?php
+    if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
+        $temp_charset = reset($cfg['AvailableCharsets']);
+        echo $strCharsetOfFile . "\n"
+           . '            <select name="charset_of_file" size="1">' . "\n"
+           . '                <option value="' . $temp_charset . '"';
+        if ($temp_charset == $charset) {
+            echo ' selected="selected"';
+        }
+        echo '>' . $temp_charset . '</option>' . "\n";
+        while ($temp_charset = next($cfg['AvailableCharsets'])) {
+            echo '                <option value="' . $temp_charset . '"';
+            if ($temp_charset == $charset) {
+                echo ' selected="selected"';
+            }
+            echo '>' . $temp_charset . '</option>' . "\n";
+        }
+    echo '            </select>';
+    }
+?>
     </div>
     <?php
 } // end if
diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3
index b36216012..55300973c 100644
--- a/lang/afrikaans-iso-8859-1.inc.php3
+++ b/lang/afrikaans-iso-8859-1.inc.php3
@@ -421,4 +421,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3
index e0917403e..1b6f407b8 100644
--- a/lang/afrikaans-utf-8.inc.php3
+++ b/lang/afrikaans-utf-8.inc.php3
@@ -422,4 +422,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3
index 7f6100c7c..46023d82a 100644
--- a/lang/albanian-iso-8859-1.inc.php3
+++ b/lang/albanian-iso-8859-1.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3
index 3aba8d9bc..1bc31f0f3 100644
--- a/lang/albanian-utf-8.inc.php3
+++ b/lang/albanian-utf-8.inc.php3
@@ -421,4 +421,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3
index 0dac89a02..593c262a8 100644
--- a/lang/arabic-utf-8.inc.php3
+++ b/lang/arabic-utf-8.inc.php3
@@ -421,4 +421,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3
index c5ee8b9f9..05ab7fc50 100644
--- a/lang/arabic-windows-1256.inc.php3
+++ b/lang/arabic-windows-1256.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3
index e346cf911..9454b04f8 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php3
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3
index 68c17eaa7..44021690a 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php3
+++ b/lang/brazilian_portuguese-utf-8.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3
index b188f736f..9bc0a49e9 100644
--- a/lang/bulgarian-koi8-r.inc.php3
+++ b/lang/bulgarian-koi8-r.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3
index be2bf027f..9807f64e3 100644
--- a/lang/bulgarian-utf-8.inc.php3
+++ b/lang/bulgarian-utf-8.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3
index b3657b357..37921b178 100644
--- a/lang/bulgarian-windows-1251.inc.php3
+++ b/lang/bulgarian-windows-1251.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3
index b5a14f7c9..fff4393c6 100644
--- a/lang/catalan-iso-8859-1.inc.php3
+++ b/lang/catalan-iso-8859-1.inc.php3
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3
index cd3cadb19..65d70fd6d 100644
--- a/lang/catalan-utf-8.inc.php3
+++ b/lang/catalan-utf-8.inc.php3
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3
index 3acb37ca6..0f40259b5 100644
--- a/lang/chinese_big5-utf-8.inc.php3
+++ b/lang/chinese_big5-utf-8.inc.php3
@@ -421,4 +421,5 @@ $strYes = ' 是 ';
 $strZip = '"zipped"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index d23dd7b44..c79e03a75 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -420,4 +420,5 @@ $strYes = ' 
 $strZip = '"zipped"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3
index 514da1765..d0357966d 100644
--- a/lang/chinese_gb-utf-8.inc.php3
+++ b/lang/chinese_gb-utf-8.inc.php3
@@ -418,4 +418,5 @@ $strYes = '是';
 $strZip = '"zipped"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index f4fa1c08e..c735dcec0 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -417,4 +417,5 @@ $strYes = '
 $strZip = '"zipped"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3
index c8bb528f2..1896d70b5 100644
--- a/lang/croatian-iso-8859-2.inc.php3
+++ b/lang/croatian-iso-8859-2.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3
index 0220be4ed..64828d8da 100644
--- a/lang/croatian-utf-8.inc.php3
+++ b/lang/croatian-utf-8.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3
index 1040eda67..ee55af01e 100644
--- a/lang/croatian-windows-1250.inc.php3
+++ b/lang/croatian-windows-1250.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3
index 464153565..6b332f9c6 100644
--- a/lang/czech-iso-8859-2.inc.php3
+++ b/lang/czech-iso-8859-2.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3
index 8015e373d..0b640f72f 100644
--- a/lang/czech-utf-8.inc.php3
+++ b/lang/czech-utf-8.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3
index 8dd02aff6..10663eb27 100644
--- a/lang/czech-windows-1250.inc.php3
+++ b/lang/czech-windows-1250.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3
index 29f8ebd46..b33fcefab 100644
--- a/lang/danish-iso-8859-1.inc.php3
+++ b/lang/danish-iso-8859-1.inc.php3
@@ -413,4 +413,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3
index adebc57d1..51086bb8e 100644
--- a/lang/danish-utf-8.inc.php3
+++ b/lang/danish-utf-8.inc.php3
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3
index 13df8fa88..175d1819c 100644
--- a/lang/dutch-iso-8859-1.inc.php3
+++ b/lang/dutch-iso-8859-1.inc.php3
@@ -155,7 +155,7 @@ $strFullText = 'Volledige teksten';
 $strFunction = 'Functie';
 
 $strGenBy = 'Gegenereerd door';
-$strGeneralRelationFeat = 'Basis relatie opties'; 
+$strGeneralRelationFeat = 'Basis relatie opties';
 $strGenTime = 'Generatie Tijd';
 $strGo = 'Start';
 $strGrants = 'Toekennen';
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3
index 77a0bdb11..81aa22ecc 100644
--- a/lang/dutch-utf-8.inc.php3
+++ b/lang/dutch-utf-8.inc.php3
@@ -156,7 +156,7 @@ $strFullText = 'Volledige teksten';
 $strFunction = 'Functie';
 
 $strGenBy = 'Gegenereerd door';
-$strGeneralRelationFeat = 'Basis relatie opties'; 
+$strGeneralRelationFeat = 'Basis relatie opties';
 $strGenTime = 'Generatie Tijd';
 $strGo = 'Start';
 $strGrants = 'Toekennen';
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3
index afb94d2f6..96e4b16b1 100644
--- a/lang/english-iso-8859-1.inc.php3
+++ b/lang/english-iso-8859-1.inc.php3
@@ -70,6 +70,7 @@ $strCarriage = 'Carriage return: \\r';
 $strChange = 'Change';
 $strChangeDisplay = 'Choose Field to display';
 $strChangePassword = 'Change password';
+$strCharsetOfFile = 'Character set of the file:';
 $strCheckAll = 'Check All';
 $strCheckDbPriv = 'Check Database Privileges';
 $strCheckTable = 'Check table';
@@ -412,4 +413,6 @@ $strWrongUser = 'Wrong username/password. Access denied.';
 $strYes = 'Yes';
 
 $strZip = '"zipped"';
+
+//New
 ?>
diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3
index 7c76f6d5e..395d012dd 100644
--- a/lang/english-utf-8.inc.php3
+++ b/lang/english-utf-8.inc.php3
@@ -68,9 +68,11 @@ $strCantRenameIdxToPrimary = 'Can\'t rename index to PRIMARY!';
 $strCantUseRecodeIconv = 'Can not use iconv nor libiconv nor recode_string function while extension reports to be loaded. Check your php configuration.';
 $strCardinality = 'Cardinality';
 $strCarriage = 'Carriage return: \\r';
+$strCharsetOfFile = 'Character set of the file:';
 $strChange = 'Change';
 $strChangeDisplay = 'Choose Field to display';
 $strChangePassword = 'Change password';
+$strCharsetOfFile = 'Character set of the file:';
 $strCheckAll = 'Check All';
 $strCheckDbPriv = 'Check Database Privileges';
 $strCheckTable = 'Check table';
@@ -413,4 +415,6 @@ $strWrongUser = 'Wrong username/password. Access denied.';
 $strYes = 'Yes';
 
 $strZip = '"zipped"';
+
+// New
 ?>
diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3
index 309177d42..cb166c5c0 100644
--- a/lang/estonian-iso-8859-1.inc.php3
+++ b/lang/estonian-iso-8859-1.inc.php3
@@ -398,22 +398,23 @@ $strYes = 'Jah';
 
 $strZip = '"zipitud"';
 
-$strRelationNotWorking = 'Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda miks see nii on, vajutage %ssiia%s.';  
-$strAllTableSameWidth = 'kuva kõik tabelid sama laiusega?';  
+$strRelationNotWorking = 'Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda miks see nii on, vajutage %ssiia%s.';
+$strAllTableSameWidth = 'kuva kõik tabelid sama laiusega?';
 
-$strPdfNoTables = 'Pole tabeleid';  
-$strDisplayFeat = 'Kuva võimalused';  
-$strCreatePdfFeat = 'PDF-ide tegemine';  
-$strColComFeat = 'Näitan veeru kommentaare';  
+$strPdfNoTables = 'Pole tabeleid';
+$strDisplayFeat = 'Kuva võimalused';
+$strCreatePdfFeat = 'PDF-ide tegemine';
+$strColComFeat = 'Näitan veeru kommentaare';
 $strDisabled = 'Keelatud';
-$strEnabled = 'Lubatud'; 
+$strEnabled = 'Lubatud';
 $strOK = 'OK';  //to translate
-$strNotOK = 'Ei ole OK';  
-$strGeneralRelationFeat = 'Peamised seoste võimalused';  
+$strNotOK = 'Ei ole OK';
+$strGeneralRelationFeat = 'Peamised seoste võimalused';
 
 // To translate
 $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3
index 136e5dffa..ceabc8ba3 100644
--- a/lang/estonian-utf-8.inc.php3
+++ b/lang/estonian-utf-8.inc.php3
@@ -399,22 +399,23 @@ $strYes = 'Jah';
 
 $strZip = '"zipitud"';
 
-$strRelationNotWorking = 'Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda miks see nii on, vajutage %ssiia%s.';  
-$strAllTableSameWidth = 'kuva kõik tabelid sama laiusega?';  
+$strRelationNotWorking = 'Lisavõimalused töötamiseks lingitud tabelitega on deaktiveeritud. Et lugeda miks see nii on, vajutage %ssiia%s.';
+$strAllTableSameWidth = 'kuva kõik tabelid sama laiusega?';
 
-$strPdfNoTables = 'Pole tabeleid';  
-$strDisplayFeat = 'Kuva võimalused';  
-$strCreatePdfFeat = 'PDF-ide tegemine';  
-$strColComFeat = 'Näitan veeru kommentaare';  
+$strPdfNoTables = 'Pole tabeleid';
+$strDisplayFeat = 'Kuva võimalused';
+$strCreatePdfFeat = 'PDF-ide tegemine';
+$strColComFeat = 'Näitan veeru kommentaare';
 $strDisabled = 'Keelatud';
-$strEnabled = 'Lubatud'; 
+$strEnabled = 'Lubatud';
 $strOK = 'OK';  //to translate
-$strNotOK = 'Ei ole OK';  
-$strGeneralRelationFeat = 'Peamised seoste võimalused';  
+$strNotOK = 'Ei ole OK';
+$strGeneralRelationFeat = 'Peamised seoste võimalused';
 
 // To translate
 $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3
index f3296bd2f..d347ae8e9 100644
--- a/lang/finnish-iso-8859-1.inc.php3
+++ b/lang/finnish-iso-8859-1.inc.php3
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3
index e8565ca60..9df106c8c 100644
--- a/lang/finnish-utf-8.inc.php3
+++ b/lang/finnish-utf-8.inc.php3
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3
index 7af905b7c..889525422 100644
--- a/lang/french-iso-8859-1.inc.php3
+++ b/lang/french-iso-8859-1.inc.php3
@@ -70,6 +70,7 @@ $strCarriage = 'Retour de chariot : \\r';
 $strChange = 'Modifier';
 $strChangeDisplay = 'Champ à afficher';
 $strChangePassword = 'Modifier le mot de passe';
+$strCharsetOfFile = 'Jeu de caractères du fichier:';
 $strCheckAll = 'Tout cocher';
 $strCheckDbPriv = 'Afficher les privilèges sur';
 $strCheckTable = 'Vérifier la table';
diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3
index 11ac90bc6..855fc2ba3 100644
--- a/lang/french-utf-8.inc.php3
+++ b/lang/french-utf-8.inc.php3
@@ -71,6 +71,7 @@ $strCarriage = 'Retour de chariot : \\r';
 $strChange = 'Modifier';
 $strChangeDisplay = 'Champ à afficher';
 $strChangePassword = 'Modifier le mot de passe';
+$strCharsetOfFile = 'Jeu de caractères du fichier:';
 $strCheckAll = 'Tout cocher';
 $strCheckDbPriv = 'Afficher les privilèges sur';
 $strCheckTable = 'Vérifier la table';
diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3
index b634e63a5..003b8ff76 100644
--- a/lang/galician-iso-8859-1.inc.php3
+++ b/lang/galician-iso-8859-1.inc.php3
@@ -78,7 +78,7 @@ $strCheckAll = 'Marc
 $strCheckDbPriv = 'Verificar os privilexios do banco de datos';
 $strCheckTable = 'Verificar a tabela';
 $strChoosePage = 'Escolla unha páxina para modificar';
-$strColComFeat = 'Mostrando os comentarios das columnas'; 
+$strColComFeat = 'Mostrando os comentarios das columnas';
 $strColumn = 'Columna';
 $strColumnNames = 'Nomes das Columnas';
 $strComments = 'Comentarios';
@@ -95,7 +95,7 @@ $strCreateIndexTopic = 'Crear un novo 
 $strCreateNewDatabase = 'Crear un novo banco de datos';
 $strCreateNewTable = 'Crear unha tabela nova na base de datos %s';
 $strCreatePage = 'Crear unha páxina nova';
-$strCreatePdfFeat = 'Creación de PDFs'; 
+$strCreatePdfFeat = 'Creación de PDFs';
 $strCriteria = 'Criterio';
 
 $strData = 'Datos';
@@ -112,9 +112,9 @@ $strDeletedRows = 'Filas borradas:';
 $strDeleteFailed = 'Non foi posible eliminar!';
 $strDeleteUserMessage = 'Acaba de eliminar o usuario %s.';
 $strDescending = 'Descendente';
-$strDisabled = 'Desactivado'; 
+$strDisabled = 'Desactivado';
 $strDisplay = 'Mostrar';
-$strDisplayFeat = 'Mostrar as características'; 
+$strDisplayFeat = 'Mostrar as características';
 $strDisplayOrder = 'Mostrar en orde:';
 $strDisplayPDF = 'Mostrar o esquema PDF';
 $strDoAQuery = 'Faga unha "procura por exemplo" (o comodín é "%")';
@@ -133,7 +133,7 @@ $strEditPrivileges = 'Modificar privilexios';
 $strEffective = 'Efectivo';
 $strEmpty = 'Borrar';
 $strEmptyResultSet = 'MySQL retornou um conxunto vacío (ex. cero rexistros).';
-$strEnabled = 'Activado'; 
+$strEnabled = 'Activado';
 $strEnd = 'Fin';
 $strEnglishPrivileges = ' Nota: os nomes de privilexios do MySQL están en inglés';
 $strError = 'Erro';
@@ -157,7 +157,7 @@ $strFullText = 'Textos completos';
 $strFunction = 'Funcións';
 
 $strGenBy = 'Xerado por';
-$strGeneralRelationFeat = 'Características xerais das relacións'; 
+$strGeneralRelationFeat = 'Características xerais das relacións';
 $strGenTime = 'Xerado en';
 $strGo = 'Executar';
 $strGrants = 'Conceder';
@@ -237,7 +237,7 @@ $strNoPrivileges = 'Sen Privilexios';
 $strNoQuery = 'Non hai procura SQL!';
 $strNoRights = 'Non ten direitos suficientes para estar aquí agora!';
 $strNoTablesFound = 'Non se achou nengunha tabela no banco de datos';
-$strNotOK = 'non conforme'; 
+$strNotOK = 'non conforme';
 $strNotSet = 'Non se atopou a tabela <b>%s</b>ou non se indicou en %s';
 $strNotNumber = 'Non é un número!';
 $strNotValidNumber = ' non é un número válido para unha fila!';
@@ -247,7 +247,7 @@ $strNumSearchResultsInTable = '%s ocorrencias(s) dentro da tabela <i>%s</i>';
 $strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> ocorrencia(s)';
 
 $strOftenQuotation = 'Xeralmente son aspas. OPCIONAL significa que só os campos de caracteres son delimitados por caracteres "delimitadores"';
-$strOK = 'Conforme'; 
+$strOK = 'Conforme';
 $strOperations = 'Operacións';
 $strOptimizeTable = 'Optimizar a tabela';
 $strOptionalControls = 'Opcional. Controla como se han de ler e escreber os caracteres especiais.';
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3
index 842b83efb..573674ba3 100644
--- a/lang/galician-utf-8.inc.php3
+++ b/lang/galician-utf-8.inc.php3
@@ -79,7 +79,7 @@ $strCheckAll = 'Marcá-los todos';
 $strCheckDbPriv = 'Verificar os privilexios do banco de datos';
 $strCheckTable = 'Verificar a tabela';
 $strChoosePage = 'Escolla unha páxina para modificar';
-$strColComFeat = 'Mostrando os comentarios das columnas'; 
+$strColComFeat = 'Mostrando os comentarios das columnas';
 $strColumn = 'Columna';
 $strColumnNames = 'Nomes das Columnas';
 $strComments = 'Comentarios';
@@ -96,7 +96,7 @@ $strCreateIndexTopic = 'Crear un novo índice';
 $strCreateNewDatabase = 'Crear un novo banco de datos';
 $strCreateNewTable = 'Crear unha tabela nova na base de datos %s';
 $strCreatePage = 'Crear unha páxina nova';
-$strCreatePdfFeat = 'Creación de PDFs'; 
+$strCreatePdfFeat = 'Creación de PDFs';
 $strCriteria = 'Criterio';
 
 $strData = 'Datos';
@@ -113,9 +113,9 @@ $strDeletedRows = 'Filas borradas:';
 $strDeleteFailed = 'Non foi posible eliminar!';
 $strDeleteUserMessage = 'Acaba de eliminar o usuario %s.';
 $strDescending = 'Descendente';
-$strDisabled = 'Desactivado'; 
+$strDisabled = 'Desactivado';
 $strDisplay = 'Mostrar';
-$strDisplayFeat = 'Mostrar as características'; 
+$strDisplayFeat = 'Mostrar as características';
 $strDisplayOrder = 'Mostrar en orde:';
 $strDisplayPDF = 'Mostrar o esquema PDF';
 $strDoAQuery = 'Faga unha "procura por exemplo" (o comodín é "%")';
@@ -134,7 +134,7 @@ $strEditPrivileges = 'Modificar privilexios';
 $strEffective = 'Efectivo';
 $strEmpty = 'Borrar';
 $strEmptyResultSet = 'MySQL retornou um conxunto vacío (ex. cero rexistros).';
-$strEnabled = 'Activado'; 
+$strEnabled = 'Activado';
 $strEnd = 'Fin';
 $strEnglishPrivileges = ' Nota: os nomes de privilexios do MySQL están en inglés';
 $strError = 'Erro';
@@ -158,7 +158,7 @@ $strFullText = 'Textos completos';
 $strFunction = 'Funcións';
 
 $strGenBy = 'Xerado por';
-$strGeneralRelationFeat = 'Características xerais das relacións'; 
+$strGeneralRelationFeat = 'Características xerais das relacións';
 $strGenTime = 'Xerado en';
 $strGo = 'Executar';
 $strGrants = 'Conceder';
@@ -238,7 +238,7 @@ $strNoPrivileges = 'Sen Privilexios';
 $strNoQuery = 'Non hai procura SQL!';
 $strNoRights = 'Non ten direitos suficientes para estar aquí agora!';
 $strNoTablesFound = 'Non se achou nengunha tabela no banco de datos';
-$strNotOK = 'non conforme'; 
+$strNotOK = 'non conforme';
 $strNotSet = 'Non se atopou a tabela <b>%s</b>ou non se indicou en %s';
 $strNotNumber = 'Non é un número!';
 $strNotValidNumber = ' non é un número válido para unha fila!';
@@ -248,7 +248,7 @@ $strNumSearchResultsInTable = '%s ocorrencias(s) dentro da tabela <i>%s</i>';
 $strNumSearchResultsTotal = '<b>Total:</b> <i>%s</i> ocorrencia(s)';
 
 $strOftenQuotation = 'Xeralmente son aspas. OPCIONAL significa que só os campos de caracteres son delimitados por caracteres "delimitadores"';
-$strOK = 'Conforme'; 
+$strOK = 'Conforme';
 $strOperations = 'Operacións';
 $strOptimizeTable = 'Optimizar a tabela';
 $strOptionalControls = 'Opcional. Controla como se han de ler e escreber os caracteres especiais.';
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3
index b8f317bf4..10f62d8ab 100644
--- a/lang/georgian-utf-8.inc.php3
+++ b/lang/georgian-utf-8.inc.php3
@@ -83,7 +83,7 @@ $strColumnNames = 'სვეტის ს�ხელები';
 $strComments = 'კ�მენტ�რი';
 $strCompleteInserts = 'სრულყ�ფილი ჩ�მ�ტებ�';
 $strConfigFileError = 'phpMyAdmin-მ� ვერ შეძლ� კ�ნფიგურ�ციის ფ�ილის წ�კითხვ�!<br/>ეს მ�შინ ხდებ� თუ php-მ იპ�ვ� parse შეცდ�მ�, �ნ php-მ ვერ იპ�ვ� ფ�ილი.<br />გ�მ�იძ�ხეთ კ�ნფიგურ�ციის ფ�ილი დ� ქვევით ჩ�მ�წერილი შეცდ�მები გ��სწ�რეთ. უმეტეს შემთხვევ�ში წერტილ-მძიმე �კლი� ხ�ლმე.<br />თუ ც�რიელი გვერდი ჩ�მ�იტვირთ�, ესეიგი ყველ�ფერი რიგზე�.';
-$strConfigureTableCoord = 'ს�ჭირ�� %s ცხრილის კ��რდინ�ტების კ�ნფიგურირებ�'; 
+$strConfigureTableCoord = 'ს�ჭირ�� %s ცხრილის კ��რდინ�ტების კ�ნფიგურირებ�';
 $strConfirm = 'თქვენ დ�რწმუნებული ხ�რთ რ�მ გინდ�თ �მის გ�კეთებ�?';
 $strCookiesRequired = '�მ �დგილის შემდეგ Cookies უნდ� ჩ�რთ�თ.';
 $strCopyTable = 'ცხრილის კ�პირებ� (ბ�ზ�<b>.</b>ცხრილი):';
@@ -396,4 +396,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3
index 1ae1ec39d..2856d13ce 100644
--- a/lang/german-iso-8859-1.inc.php3
+++ b/lang/german-iso-8859-1.inc.php3
@@ -78,6 +78,7 @@ $strCarriage = 'Wagenr
 $strChange = 'Ändern';
 $strChangeDisplay = 'Anzuzeigende Spalte bestimmen';
 $strChangePassword = 'Kennwort ändern';
+$strCharsetOfFile = 'Zeichencodierung der Datei:';
 $strCheckAll = 'Alle auswählen';
 $strCheckDbPriv = 'Rechte einer Datenbank prüfen';
 $strCheckTable = 'Überprüfe Tabelle';
diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3
index f23b76d67..ea75debc6 100644
--- a/lang/german-utf-8.inc.php3
+++ b/lang/german-utf-8.inc.php3
@@ -79,6 +79,7 @@ $strCarriage = 'Wagenrücklauf \\r';
 $strChange = 'Ändern';
 $strChangeDisplay = 'Anzuzeigende Spalte bestimmen';
 $strChangePassword = 'Kennwort ändern';
+$strCharsetOfFile = 'Zeichencodierung der Datei:';
 $strCheckAll = 'Alle auswählen';
 $strCheckDbPriv = 'Rechte einer Datenbank prüfen';
 $strCheckTable = 'Überprüfe Tabelle';
diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3
index 7880251a5..5cdfe9eb7 100644
--- a/lang/greek-iso-8859-7.inc.php3
+++ b/lang/greek-iso-8859-7.inc.php3
@@ -390,4 +390,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3
index 0c00545a9..c544f30a7 100644
--- a/lang/greek-utf-8.inc.php3
+++ b/lang/greek-utf-8.inc.php3
@@ -391,4 +391,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3
index 5e9f74c20..a678dfeef 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php3
+++ b/lang/hebrew-iso-8859-8-i.inc.php3
@@ -65,12 +65,12 @@ $strCantRenameIdxToPrimary = '
 $strCardinality = 'Cardinality';
 $strCarriage = 'úå äçæøú âøøä: \\r';
 $strChange = 'ùðä';
-$strChangeDisplay = 'áçø ùãä ìäöâä';  
+$strChangeDisplay = 'áçø ùãä ìäöâä';
 $strChangePassword = 'ùðä ñéñîä';
 $strCheckAll = 'ñîï äëì';
 $strCheckDbPriv = 'áãå÷ àú äøùàåú îñã äðúåðéí';
 $strCheckTable = 'áãå÷ èáìä';
-$strChoosePage = 'àðà áçø òîåã ìòøéëä'; 
+$strChoosePage = 'àðà áçø òîåã ìòøéëä';
 $strColumn = 'òîåãä';
 $strColumnNames = 'ùîåú äùåøåú';
 $strComments = 'äòøåú';
@@ -85,7 +85,7 @@ $strCreateIndex = '
 $strCreateIndexTopic = 'öåø àéð÷ñ çãù';
 $strCreateNewDatabase = 'öåø îñã ðúåðéí çãù';
 $strCreateNewTable = 'öåø èáìä çãùä òì îñã äðúåðéí %s';
-$strCreatePage = 'öåø òîåã çãù'; 
+$strCreatePage = 'öåø òîåã çãù';
 $strCriteria = '÷øéèøéåï';
 
 $strData = 'îéãò';
@@ -104,7 +104,7 @@ $strDeletedRows = '
 $strDescending = 'éåøã';
 $strDisplay = 'äöâ';
 $strDisplayOrder = 'ñãø äöâä:';
-$strDisplayPDF = 'äöâ ñëîä áôåøîè PDF';  
+$strDisplayPDF = 'äöâ ñëîä áôåøîè PDF';
 $strDoAQuery = 'öåø "ùàéìúä ìãåâîä" (úå ëììé: "%")';
 $strDoYouReally = 'äàí àúä áàîú øåöä ìáöò ';
 $strDocu = 'úéòåã';
@@ -115,7 +115,7 @@ $strDumpingData = '
 $strDynamic = 'ãéðàîé';
 
 $strEdit = 'òøåê';
-$strEditPDFPages = 'òøåê ãôé PDF';  
+$strEditPDFPages = 'òøåê ãôé PDF';
 $strEditPrivileges = 'òøåê äøùàåú';
 $strEffective = 'àô÷èéáé';
 $strEmpty = 'øå÷ï';
@@ -123,8 +123,8 @@ $strEmptyResultSet = 'MySQL 
 $strEnd = 'ñåó';
 $strEnglishPrivileges = ' äòøä: äøùàåú MySQL ðëúáéí áàðâìéú ';
 $strError = 'ú÷ìä';
-$strExport = 'ééöà'; 
-$strExportToXML = 'ééöà ìôåøîè XML'; 
+$strExport = 'ééöà';
+$strExportToXML = 'ééöà ìôåøîè XML';
 $strExtendedInserts = 'äëðñåú îåøçáåú';
 $strExtra = 'ðåñó';
 
@@ -184,7 +184,7 @@ $strLineFeed = '
 $strLines = 'ùåøåú';
 $strLinesTerminatedBy = 'ùåøåú ðâîøåú òì-éãé';
 $strLinkNotFound = '÷éùåø ìà ðîöà';
-$strLinksTo = '÷éùåøéí ì-';  
+$strLinksTo = '÷éùåøéí ì-';
 $strLocationTextfile = 'îé÷åí ÷åáõ äè÷ñè';
 $strLogPassword = 'ñéñîä:';
 $strLogUsername = 'ùí îùúîù:';
@@ -215,7 +215,7 @@ $strNoIndex = '
 $strNoIndexPartsDefined = 'àéï çì÷é àéðã÷ñ îåâãøéí !';
 $strNoModification = 'àéï ùéðåé';
 $strNoPassword = 'àéï ñéñîä';
-$strNoPhp = 'ììà ÷åã PHP'; 
+$strNoPhp = 'ììà ÷åã PHP';
 $strNoPrivileges = 'àéï äøùàåú';
 $strNoQuery = 'àéï ùàéìúú SQL !';
 $strNoRights = 'àéï ìê îñôé÷ æëåéåú ëãé ìäéåú ëàï òëùéå !';
@@ -223,30 +223,30 @@ $strNoTablesFound = '
 $strNoUsersFound = 'àó îùúîù/îùúîùéí ðîöàå.';
 $strNone = 'NULL';
 $strNotNumber = 'æäå ìà îñôø !';
-$strNotSet = 'äèáìä <b>%s</b> ìà ðîöàä á- %s'; 
+$strNotSet = 'äèáìä <b>%s</b> ìà ðîöàä á- %s';
 $strNotValidNumber = ' äåà ìà îñôø ùåøä áø úå÷ó !';
 $strNull = 'NULL';
 $strNumSearchResultsInTable = '%s úåöàä/úåöàåú áúåê äèáìä <i>%s</i>';
 
 $strOftenQuotation = 'îøëàåú ðôåöåú. áúåø àåôöéä îúëååï ùø÷ ùãåú char å- varchar ðñâøéí òì éãé îøëàåú.';
-$strOperations = 'ôòåìåú';  
+$strOperations = 'ôòåìåú';
 $strOptimizeTable = 'ééòì èáìä';
 $strOptionalControls = 'àåôöéä. á÷øä òì ÷øéàä åëúéáä ùì ñéîðéí îéåçãéí.';
 $strOptionally = 'áúåø àåôöéä';
-$strOptions = 'àôùøåéåú';  
+$strOptions = 'àôùøåéåú';
 $strOr = 'àå';
 $strOverhead = 'ú÷åøä';
 
 $strPHPVersion = 'âøñú PHP';
-$strPageNumber = 'îñôø òîåã:';  
+$strPageNumber = 'îñôø òîåã:';
 $strPartialText = 'è÷ñèéí çì÷ééí';
 $strPassword = 'ñéñîä';
 $strPasswordEmpty = 'äñéñîä øé÷ä !';
 $strPasswordNotSame = 'äñéñîàåú àéðï æäåú !';
-$strPdfDbSchema = 'ñëîú îñã äðúåðéí "%s" - òîåã %s';  
-$strPdfInvalidPageNum = 'îñôø òîåã ùì PDF ìà îåâãø!'; 
-$strPdfInvalidTblName = 'äèáìä "%s" ìà ÷ééîú!';  
-$strPhp = 'öåø ÷åã PHP';  
+$strPdfDbSchema = 'ñëîú îñã äðúåðéí "%s" - òîåã %s';
+$strPdfInvalidPageNum = 'îñôø òîåã ùì PDF ìà îåâãø!';
+$strPdfInvalidTblName = 'äèáìä "%s" ìà ÷ééîú!';
+$strPhp = 'öåø ÷åã PHP';
 $strPmaDocumentation = 'ãå÷åîðèöéú phpMyAdmin';
 $strPmaUriError = 'äðçééú ä- <tt>$cfg[\'PmaAbsoluteUri\']</tt> çééáú ìäéåú îîå÷îú á÷åáõ ä÷åðôéâåøöéä ùìê!';
 $strPos1 = 'äúçì';
@@ -268,7 +268,7 @@ $strQueryOnDb = '
 $strReType = 'äëðñ îçãù';
 $strRecords = 'øùåîåú';
 $strReferentialIntegrity = 'áãå÷ àú ä- Referential Integrity:';
-$strRelationView = 'úöåâú éçñ';  
+$strRelationView = 'úöåâú éçñ';
 $strReloadFailed = 'èòéðä îçãù ùì MySQL ðëùìä.';
 $strReloadMySQL = 'èòï îçãù àú MySQL';
 $strRememberReload = 'æëåø ìèòåï îçãù àú äùøú.';
@@ -295,9 +295,9 @@ $strRunQuery = '
 $strRunSQLQuery = 'äøõ àú ùàéìúä/ùàéìúåú òì îñã äðúåðéí %s';
 $strRunning = 'øõ òì %s';
 
-$strSQL = 'SQL'; 
+$strSQL = 'SQL';
 $strSQLQuery = 'ùàéìúú SQL';
-$strSQLResult = 'úåöàåú SQL'; 
+$strSQLResult = 'úåöàåú SQL';
 $strSave = 'ùîåø';
 $strSearch = 'çôù';
 $strSearchFormTitle = 'çôù áîñã äðúåðéí';
@@ -313,14 +313,14 @@ $strSelectADb = '
 $strSelectAll = 'áçø äëì';
 $strSelectFields = 'áçø ùãåú (ìôçåú àçã):';
 $strSelectNumRows = 'îáöò ùàéìúä';
-$strSelectTables = 'áçø èáìàåú'; 
+$strSelectTables = 'áçø èáìàåú';
 $strSend = 'ùîåø ë÷åáõ';
 $strServerChoice = 'áçéøú ùøú';
 $strServerVersion = 'âøñú ùøú';
 $strSetEnumVal = 'àí ñåâ äùãä äåà enum àå set, äëðñ áá÷ùä òøëéí äîùúîùéí áôåøîè äáà: \'a\',\'b\',\'c\'...<br />àí úùéí àé ôòí ñéîï \ àå îøëàä àçú éçã òí äòøëéí äììå, äåñó \ ìôðéå.';
 $strShow = 'äøàä';
 $strShowAll = 'äøàä äëì';
-$strShowColor = 'äöâ öáò';  
+$strShowColor = 'äöâ öáò';
 $strShowCols = 'äøàä èåøéí';
 $strShowPHPInfo = 'äøàä îéãò PHP';
 $strShowTables = 'äøàä èáìàåú';
@@ -337,8 +337,8 @@ $strStrucData = '
 $strStrucDrop = 'äåñó \'îç÷ èáìä\'';
 $strStrucExcelCSV = 'CVS ìîéãò Ms Excel';
 $strStrucOnly = 'îáðä áìáã';
-$strStructPropose = 'äöò îáðé èáìä'; 
-$strStructure = 'îáðéí';  
+$strStructPropose = 'äöò îáðé èáìä';
+$strStructure = 'îáðéí';
 $strSubmit = 'ùìç';
 $strSuccess = 'ùàéìúú ä- SQL ùìê áåöòä áäöìçä';
 $strSum = 'ñéëåí';
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3
index 1cc5a6a70..06f4996ef 100644
--- a/lang/hungarian-iso-8859-2.inc.php3
+++ b/lang/hungarian-iso-8859-2.inc.php3
@@ -34,7 +34,7 @@ $strAfter = '%s ut
 $strAfterInsertBack = 'Vissza az el&#0337z&#0337 oldalra';
 $strAfterInsertNewInsert = 'Új sor beszúrása';
 $strAll = 'Mind';
-$strAllTableSameWidth = 'minden tábla ezzel a szélességgel jelenjen meg?'; 
+$strAllTableSameWidth = 'minden tábla ezzel a szélességgel jelenjen meg?';
 $strAlterOrderBy = 'Tábla megváltozása rendezve e szerint:';
 $strAnalyzeTable = 'Tábla vizsgálat';
 $strAnd = 'És';
@@ -77,9 +77,9 @@ $strCheckTable = 'T
 $strChoosePage = 'Válassz oldalt a szerkesztéshez';
 $strColumn = 'Oszlop';
 $strColumnNames = 'Oszlop nevek';
-$strComments = 'Megjegyzések'; 
+$strComments = 'Megjegyzések';
 $strCompleteInserts = 'Mez&#0337neveket is hozzáadja';
-$strConfigFileError = 'A phpMyAdmin nem tudja olvasni a konfigurációs fájlt!<br />Lehet, hogy a php szintaktikai hibát talált benne, vagy nem találja a fájlt.<br />Használd az alsó linket a konfigurációs fájl helyreállításához, olvasd el a kapott php hibaüzeneteket. Többnyire egy idéz&#0337jel vagy egy pontosvessz&#0337 hiányzik valahol.<br />Ha üres oldalt kapsz, minden rendben.'; 
+$strConfigFileError = 'A phpMyAdmin nem tudja olvasni a konfigurációs fájlt!<br />Lehet, hogy a php szintaktikai hibát talált benne, vagy nem találja a fájlt.<br />Használd az alsó linket a konfigurációs fájl helyreállításához, olvasd el a kapott php hibaüzeneteket. Többnyire egy idéz&#0337jel vagy egy pontosvessz&#0337 hiányzik valahol.<br />Ha üres oldalt kapsz, minden rendben.';
 $strConfigureTableCoord = 'Állítsd be a(z) $s tábla koordinátáit';
 $strConfirm = 'Biztos, hogy végre akarod hajtani?';
 $strCookiesRequired = 'A Cookie-kat most engedélyeznek kell.';
@@ -198,13 +198,13 @@ $strLogout = 'Kil
 $strLogPassword = 'Jelszó:';
 $strLogUsername = 'Felhasználói név:';
 
-$strMissingBracket = 'Hiányzó szögletes zárójel';  
+$strMissingBracket = 'Hiányzó szögletes zárójel';
 $strModifications = 'A változásokat elmentettem';
 $strModify = 'Változás';
 $strModifyIndexTopic = 'Index változása';
 $strMoveTable = 'Tábla áthelyezése ide (adatbázis<b>.</b>tábla):';
 $strMoveTableOK = '%s táblát áthelyeztem ide: %s.';
-$strMySQLCharset = 'MySQL karakterkészlet';  
+$strMySQLCharset = 'MySQL karakterkészlet';
 $strMySQLReloaded = 'MySQL újratöltve.';
 $strMySQLSaid = 'MySQL jelzi: ';
 $strMySQLServerProcess = 'MySQL %pma_s1%, szerver: %pma_s2%, felhasználó: %pma_s3%';
@@ -344,7 +344,7 @@ $strSpaceUsage = 'Helyfoglal
 $strSplitWordsWithSpace = 'A szavak fel vannak osztva szóköz karakter szerint (" ").';
 $strSQL = 'SQL';
 $strSQLQuery = 'SQL-kérés';
-$strSQLResult = 'SQL eredmény'; 
+$strSQLResult = 'SQL eredmény';
 $strStatement = 'Adatok';
 $strStrucCSV = 'CSV adat';
 $strStrucData = 'Szerkezet és adatok';
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3
index f7435acbc..38737b84b 100644
--- a/lang/hungarian-utf-8.inc.php3
+++ b/lang/hungarian-utf-8.inc.php3
@@ -35,7 +35,7 @@ $strAfter = '%s után';
 $strAfterInsertBack = 'Vissza az el&#0337z&#0337 oldalra';
 $strAfterInsertNewInsert = 'Új sor beszúrása';
 $strAll = 'Mind';
-$strAllTableSameWidth = 'minden tábla ezzel a szélességgel jelenjen meg?'; 
+$strAllTableSameWidth = 'minden tábla ezzel a szélességgel jelenjen meg?';
 $strAlterOrderBy = 'Tábla megváltozása rendezve e szerint:';
 $strAnalyzeTable = 'Tábla vizsgálat';
 $strAnd = 'És';
@@ -78,9 +78,9 @@ $strCheckTable = 'Tábla ellen&#0337rzés';
 $strChoosePage = 'Válassz oldalt a szerkesztéshez';
 $strColumn = 'Oszlop';
 $strColumnNames = 'Oszlop nevek';
-$strComments = 'Megjegyzések'; 
+$strComments = 'Megjegyzések';
 $strCompleteInserts = 'Mez&#0337neveket is hozzáadja';
-$strConfigFileError = 'A phpMyAdmin nem tudja olvasni a konfigurációs fájlt!<br />Lehet, hogy a php szintaktikai hibát talált benne, vagy nem találja a fájlt.<br />Használd az alsó linket a konfigurációs fájl helyreállításához, olvasd el a kapott php hibaüzeneteket. Többnyire egy idéz&#0337jel vagy egy pontosvessz&#0337 hiányzik valahol.<br />Ha üres oldalt kapsz, minden rendben.'; 
+$strConfigFileError = 'A phpMyAdmin nem tudja olvasni a konfigurációs fájlt!<br />Lehet, hogy a php szintaktikai hibát talált benne, vagy nem találja a fájlt.<br />Használd az alsó linket a konfigurációs fájl helyreállításához, olvasd el a kapott php hibaüzeneteket. Többnyire egy idéz&#0337jel vagy egy pontosvessz&#0337 hiányzik valahol.<br />Ha üres oldalt kapsz, minden rendben.';
 $strConfigureTableCoord = '�llítsd be a(z) $s tábla koordinátáit';
 $strConfirm = 'Biztos, hogy végre akarod hajtani?';
 $strCookiesRequired = 'A Cookie-kat most engedélyeznek kell.';
@@ -199,13 +199,13 @@ $strLogout = 'Kilépés';
 $strLogPassword = 'Jelszó:';
 $strLogUsername = 'Felhasználói név:';
 
-$strMissingBracket = 'Hiányzó szögletes zárójel';  
+$strMissingBracket = 'Hiányzó szögletes zárójel';
 $strModifications = 'A változásokat elmentettem';
 $strModify = 'Változás';
 $strModifyIndexTopic = 'Index változása';
 $strMoveTable = 'Tábla áthelyezése ide (adatbázis<b>.</b>tábla):';
 $strMoveTableOK = '%s táblát áthelyeztem ide: %s.';
-$strMySQLCharset = 'MySQL karakterkészlet';  
+$strMySQLCharset = 'MySQL karakterkészlet';
 $strMySQLReloaded = 'MySQL újratöltve.';
 $strMySQLSaid = 'MySQL jelzi: ';
 $strMySQLServerProcess = 'MySQL %pma_s1%, szerver: %pma_s2%, felhasználó: %pma_s3%';
@@ -345,7 +345,7 @@ $strSpaceUsage = 'Helyfoglalás';
 $strSplitWordsWithSpace = 'A szavak fel vannak osztva szóköz karakter szerint (" ").';
 $strSQL = 'SQL';
 $strSQLQuery = 'SQL-kérés';
-$strSQLResult = 'SQL eredmény'; 
+$strSQLResult = 'SQL eredmény';
 $strStatement = 'Adatok';
 $strStrucCSV = 'CSV adat';
 $strStrucData = 'Szerkezet és adatok';
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3
index 08e146ebc..180fd566f 100644
--- a/lang/indonesian-iso-8859-1.inc.php3
+++ b/lang/indonesian-iso-8859-1.inc.php3
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3
index ec05b9db6..68ccc57ef 100644
--- a/lang/indonesian-utf-8.inc.php3
+++ b/lang/indonesian-utf-8.inc.php3
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3
index 8c75e51a0..31caf40ed 100644
--- a/lang/italian-iso-8859-1.inc.php3
+++ b/lang/italian-iso-8859-1.inc.php3
@@ -420,4 +420,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3
index 465949235..964642c54 100644
--- a/lang/italian-utf-8.inc.php3
+++ b/lang/italian-utf-8.inc.php3
@@ -421,4 +421,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3
index 4d1c521f2..c5783830e 100644
--- a/lang/japanese-euc.inc.php3
+++ b/lang/japanese-euc.inc.php3
@@ -423,4 +423,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3
index bb7fc4946..3253d6453 100644
--- a/lang/japanese-sjis.inc.php3
+++ b/lang/japanese-sjis.inc.php3
@@ -423,4 +423,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3
index 752f4e027..accf1bb93 100644
--- a/lang/japanese-utf-8.inc.php3
+++ b/lang/japanese-utf-8.inc.php3
@@ -424,4 +424,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3
index 2e662fcd9..974f9b0f0 100644
--- a/lang/korean-ks_c_5601-1987.inc.php3
+++ b/lang/korean-ks_c_5601-1987.inc.php3
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3
index a18c1c5f8..906ded92c 100644
--- a/lang/latvian-utf-8.inc.php3
+++ b/lang/latvian-utf-8.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3
index 9e48c7147..20ac4aeef 100644
--- a/lang/latvian-windows-1257.inc.php3
+++ b/lang/latvian-windows-1257.inc.php3
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3
index 3d0dddacf..494ccf438 100644
--- a/lang/lithuanian-utf-8.inc.php3
+++ b/lang/lithuanian-utf-8.inc.php3
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3
index d4056ecbc..7fc938249 100644
--- a/lang/lithuanian-windows-1257.inc.php3
+++ b/lang/lithuanian-windows-1257.inc.php3
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3
index e196bc937..ed46c667d 100644
--- a/lang/norwegian-iso-8859-1.inc.php3
+++ b/lang/norwegian-iso-8859-1.inc.php3
@@ -36,7 +36,7 @@ $strAfter = 'Etter %s';
 $strAfterInsertBack = 'Returner';
 $strAfterInsertNewInsert = 'Sett inn en ny post';
 $strAll = 'Alle';
-$strAllTableSameWidth = 'vis alle tabeller med samme bredde?'; 
+$strAllTableSameWidth = 'vis alle tabeller med samme bredde?';
 $strAlterOrderBy = 'Endre tabell rekkefølge ved';
 $strAnalyzeTable = 'Analyser tabell';
 $strAnd = 'Og';
@@ -79,7 +79,7 @@ $strCheckTable = 'Kontroller tabell';
 $strChoosePage = 'Vennligst velg en side for redigering';
 $strColumn = 'Kolonne';
 $strColumnNames = 'Kolonnenavn';
-$strComments = 'Kommentarer'; 
+$strComments = 'Kommentarer';
 $strCompleteInserts = 'Komplette innlegg';
 $strConfigFileError = 'phpMyAdmin kunne ikke lese din konfigurasjonsfil!<br />Dette kan skje hvis PHP finner en syntaksfeil eller ikke kan finne filen.<br />Vennligst kall opp konfigurasjonsfilen direkte via linken under og les PHP feilmeldingen(e) som du vil få. I de fleste tilfeller så mangler det et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side så er alt ok.';
 $strConfigureTableCoord = 'Vennligst konfigurer koordinatene for tabell %s';
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3
index d6df3ba29..4c4bffee4 100644
--- a/lang/norwegian-utf-8.inc.php3
+++ b/lang/norwegian-utf-8.inc.php3
@@ -37,7 +37,7 @@ $strAfter = 'Etter %s';
 $strAfterInsertBack = 'Returner';
 $strAfterInsertNewInsert = 'Sett inn en ny post';
 $strAll = 'Alle';
-$strAllTableSameWidth = 'vis alle tabeller med samme bredde?'; 
+$strAllTableSameWidth = 'vis alle tabeller med samme bredde?';
 $strAlterOrderBy = 'Endre tabell rekkefølge ved';
 $strAnalyzeTable = 'Analyser tabell';
 $strAnd = 'Og';
@@ -80,7 +80,7 @@ $strCheckTable = 'Kontroller tabell';
 $strChoosePage = 'Vennligst velg en side for redigering';
 $strColumn = 'Kolonne';
 $strColumnNames = 'Kolonnenavn';
-$strComments = 'Kommentarer'; 
+$strComments = 'Kommentarer';
 $strCompleteInserts = 'Komplette innlegg';
 $strConfigFileError = 'phpMyAdmin kunne ikke lese din konfigurasjonsfil!<br />Dette kan skje hvis PHP finner en syntaksfeil eller ikke kan finne filen.<br />Vennligst kall opp konfigurasjonsfilen direkte via linken under og les PHP feilmeldingen(e) som du vil få. I de fleste tilfeller så mangler det et anførselstegn eller et semikolon et sted.<br />Hvis du får en blank side så er alt ok.';
 $strConfigureTableCoord = 'Vennligst konfigurer koordinatene for tabell %s';
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3
index 6c339766c..949117671 100644
--- a/lang/polish-iso-8859-2.inc.php3
+++ b/lang/polish-iso-8859-2.inc.php3
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3
index fa607bc00..3235469e4 100644
--- a/lang/polish-utf-8.inc.php3
+++ b/lang/polish-utf-8.inc.php3
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3
index 345bb437c..0572f9daa 100644
--- a/lang/portuguese-iso-8859-1.inc.php3
+++ b/lang/portuguese-iso-8859-1.inc.php3
@@ -73,19 +73,19 @@ $strCantUseRecodeIconv = 'N
 $strCardinality = 'Quantidade';
 $strCarriage = 'Fim de linha: \\r';
 $strChange = 'Muda';
-$strChangeDisplay = 'Escolha campo para mostrar';  
+$strChangeDisplay = 'Escolha campo para mostrar';
 $strChangePassword = 'Alterar a senha';
 $strCheckAll = 'Todos';
 $strCheckDbPriv = 'Visualiza os Privilégios da Base de Dados';
 $strCheckTable = 'Verificar tabela';
-$strChoosePage = 'Escolha uma Página para editar';  
+$strChoosePage = 'Escolha uma Página para editar';
 $strColComFeat = 'Mostrando comentários das Colunas';
 $strColumn = 'Campo';
 $strColumnNames = 'Nome dos Campos';
-$strComments = 'Comentários';  
+$strComments = 'Comentários';
 $strCompleteInserts = 'Instrucções de inserção completas';
 $strConfigFileError = 'O phpMyAdmin não foi capaz de ler o ficheiro de configuração!<br />Isto pode acontecer se o php encontrar um erro no <i>parsing</i>  ou se não conseguir encontrar o ficheiro.<br />Chame o ficheiro de configuração directamente usando o <i>link</i> a baixo e leia a(s) mensagem(ns) de erro do php. Na maior parte dos casos, trata-se de uma falta de aspas ou de um ponto e vírgula algures.<br />Se receber uma página em branco, está tudo correcto.';
-$strConfigureTableCoord = 'Configure as cordenadas para a tabela %s';  
+$strConfigureTableCoord = 'Configure as cordenadas para a tabela %s';
 $strConfirm = 'Confirma a sua opção?';
 $strCookiesRequired = 'O mecanismo de "Cookies" tem de estar ligado a partir deste ponto.';
 $strCopyTable = 'Copia tabela para (base-de-dados<b>.</b>tabela):';
@@ -95,7 +95,7 @@ $strCreateIndex = 'Criar um 
 $strCreateIndexTopic = 'Criar um novo índice';
 $strCreateNewDatabase = 'Criar nova base de dados';
 $strCreateNewTable = 'Criar nova tabela na base de dados %s';
-$strCreatePage = 'Criar uma Página nova';  
+$strCreatePage = 'Criar uma Página nova';
 $strCreatePdfFeat = 'Criação de PDFs';
 $strCriteria = 'Critérios';
 
@@ -117,7 +117,7 @@ $strDisabled = 'Desactidado';
 $strDisplay = 'Mostra';
 $strDisplayFeat = 'Mostrar Características';
 $strDisplayOrder = 'Ordem de visualização:';
-$strDisplayPDF = 'Mostrar o esquema de PDF';  
+$strDisplayPDF = 'Mostrar o esquema de PDF';
 $strDoAQuery = 'Faça uma "pesquisa por formulário" (caractere universal: "%")';
 $strDoYouReally = 'Confirma : ';
 $strDocu = 'Documentação';
@@ -129,7 +129,7 @@ $strDumpingData = 'Extraindo dados da tabela';
 $strDynamic = 'dinâmico';
 
 $strEdit = 'Edita';
-$strEditPDFPages = 'Editar páginas PDF';  
+$strEditPDFPages = 'Editar páginas PDF';
 $strEditPrivileges = 'Alterar Privilegios';
 $strEffective = 'Em uso';
 $strEmpty = 'Limpa';
@@ -157,7 +157,7 @@ $strFormat = 'Formato';
 $strFullText = 'Texto inteiro';
 $strFunction = 'Funções';
 
-$strGenBy = 'Gerado por'; 
+$strGenBy = 'Gerado por';
 $strGenTime = 'Data de Criação';
 $strGeneralRelationFeat = 'Características gerais de Relação';
 $strGo = 'Executa';
@@ -166,7 +166,7 @@ $strGzip = '"Compress
 
 $strHasBeenAltered = 'foi alterado(a).';
 $strHasBeenCreated = 'foi criado(a).';
-$strHaveToShow = 'Tem que escolher pelo menos uma coluna para mostrar';  
+$strHaveToShow = 'Tem que escolher pelo menos uma coluna para mostrar';
 $strHome = 'Início';
 $strHomepageOfficial = 'Página Oficial do phpMyAdmin';
 $strHomepageSourceforge = 'Sourceforge phpMyAdmin - Página de Download';
@@ -200,7 +200,7 @@ $strLimitNumRows = 'N
 $strLineFeed = 'Mudança de linha: \\n';
 $strLines = 'Linhas';
 $strLinesTerminatedBy = 'Linhas terminadas por';
-$strLinkNotFound = 'Link não encontrado';  
+$strLinkNotFound = 'Link não encontrado';
 $strLinksTo = 'Links para';
 $strLocationTextfile = 'Localização do arquivo de texto';
 $strLogPassword = 'Senha&nbsp;:';
@@ -214,7 +214,7 @@ $strModify = 'Modifica';
 $strModifyIndexTopic = 'Modificar um índice';
 $strMoveTable = 'Move tabela para (base de dados<b>.</b>tabela):';
 $strMoveTableOK = 'A tabela %s foi movida para %s.';
-$strMySQLCharset = 'Mapa de Caracteres do mySQL';  
+$strMySQLCharset = 'Mapa de Caracteres do mySQL';
 $strMySQLReloaded = 'MySQL reiniciado.';
 $strMySQLSaid = 'Mensagens do MySQL : ';
 $strMySQLServerProcess = 'MySQL %pma_s1% a correr em %pma_s2% como %pma_s3%';
@@ -226,14 +226,14 @@ $strName = 'Nome';
 $strNext = 'Próximo';
 $strNo = 'Não';
 $strNoDatabases = 'Sem bases de dados';
-$strNoDescription = 'sem Descrição';  
+$strNoDescription = 'sem Descrição';
 $strNoDropDatabases = 'Os comandos "DROP DATABASE" estão inibidos.';
 $strNoFrames = 'O phpMyAdmin torna-se mais agradável se usado num browser que suporte <b>frames</b>.';
 $strNoIndex = 'Nenhum indíce definido!';
 $strNoIndexPartsDefined = 'Nenhuma parte do índice definida!';
 $strNoModification = 'Sem alterações';
 $strNoPassword = 'Sem Senha';
-$strNoPhp = 'sem código PHP';  
+$strNoPhp = 'sem código PHP';
 $strNoPrivileges = 'Sem Privilégios';
 $strNoQuery = 'Nenhum comando SQL encontrado!';
 $strNoRights = 'Não tem permissões suficientes para aceder aqui, neste momento!';
@@ -242,7 +242,7 @@ $strNoUsersFound = 'Nenhum utilizador encontrado.';
 $strNone = 'Nenhum';
 $strNotNumber = 'Isto não é um número!';
 $strNotOK = 'não está OK';
-$strNotSet = 'A Tabela <b>%s</b> não foi encontrada ou não foi definida em %s';  
+$strNotSet = 'A Tabela <b>%s</b> não foi encontrada ou não foi definida em %s';
 $strNotValidNumber = ' não é um número de registo válido!';
 $strNull = 'Nulo';
 $strNumSearchResultsInTable = '%s resultado(s) na tabela <i>%s</i>';
@@ -259,16 +259,16 @@ $strOr = 'Ou';
 $strOverhead = 'Suspenso';
 
 $strPHPVersion = 'versão do PHP';
-$strPageNumber = 'Página número:';  
+$strPageNumber = 'Página número:';
 $strPartialText = 'Texto parcial';
 $strPassword = 'Senha';
 $strPasswordEmpty = 'Indique a Senha!';
 $strPasswordNotSame = 'As senhas são diferentes!\nLembre-se de confirmar a senha!';
-$strPdfDbSchema = 'Esquema da base de dados "%s" - Página %s';  
-$strPdfInvalidPageNum = 'Numero da página do PDF indefinido!';  
-$strPdfInvalidTblName = 'A tabela "%s" não existe!';  
+$strPdfDbSchema = 'Esquema da base de dados "%s" - Página %s';
+$strPdfInvalidPageNum = 'Numero da página do PDF indefinido!';
+$strPdfInvalidTblName = 'A tabela "%s" não existe!';
 $strPdfNoTables = 'Sem tablelas';
-$strPhp = 'Criar código PHP';  
+$strPhp = 'Criar código PHP';
 $strPmaDocumentation = 'Documentação do phpMyAdmin';
 $strPmaUriError = 'A directiva <tt>$cfg[\'PmaAbsoluteUri\']</tt> TEM que ser definida no ficheiro de configuração!';
 $strPos1 = 'Inicio';
@@ -291,7 +291,7 @@ $strReType = 'Confirma';
 $strRecords = 'Registos';
 $strReferentialIntegrity = 'Verificar Integridade referencial:';
 $strRelationNotWorking = 'As Características adicionais para trabalhar com ligações entre Tabelas foram desactivadas. Para saber porquê carregue %saqui%s.';
-$strRelationView = 'Vista de Relação';  
+$strRelationView = 'Vista de Relação';
 $strReloadFailed = 'Reiniciação do MySQL falhou.';
 $strReloadMySQL = 'Reiniciar o MySQL';
 $strRememberReload = 'Lembre-se de reiniciar o servidor.';
@@ -320,9 +320,9 @@ $strRunning = 'a correr em %s';
 
 $strSQL = 'SQL';
 $strSQLQuery = 'Comando SQL';
-$strSQLResult = 'Resultado SQL'; 
+$strSQLResult = 'Resultado SQL';
 $strSave = 'Guarda';
-$strScaleFactorSmall = 'O factor escala é muito pequeno para encaixar o esquema numa página';  
+$strScaleFactorSmall = 'O factor escala é muito pequeno para encaixar o esquema numa página';
 $strSearch = 'Pesquisar';
 $strSearchFormTitle = 'Pesquisar na Base de Dados';
 $strSearchInTables = 'Dentro de Tabela(s):';
@@ -338,18 +338,18 @@ $strSelectADb = 'Por favor seleccione uma base de dados';
 $strSelectAll = 'Selecciona Todas';
 $strSelectFields = 'Seleccione os campos (no mínimo 1)';
 $strSelectNumRows = 'na pesquisa';
-$strSelectTables = 'Seleccionar Tabelas';  
+$strSelectTables = 'Seleccionar Tabelas';
 $strSend = 'envia';
 $strServerChoice = 'Escolha do Servidor';
 $strServerVersion = 'Versão do servidor';
 $strSetEnumVal = 'Se o tipo de campo é "enum" ou "set", por favor introduza os valores no seguinte formato: \'a\',\'b\',\'c\'...<br />Se precisar de colocar uma barra invertida ("\") ou um apóstrofe ("\'") entre esses valores, coloque uma barra invertida antes (por exemplo \'\\\\xyz\' ou \'a\\\'b\').';
 $strShow = 'Mostra';
 $strShowAll = 'Mostrar tudo';
-$strShowColor = 'Mostrar côr';  
+$strShowColor = 'Mostrar côr';
 $strShowCols = 'Mostra Colunas';
-$strShowGrid = 'Mostrar grelha';  
+$strShowGrid = 'Mostrar grelha';
 $strShowPHPInfo = 'Mostra informação do PHP';
-$strShowTableDimension = 'Mostrar dimensão das tabelas';  
+$strShowTableDimension = 'Mostrar dimensão das tabelas';
 $strShowTables = 'Mostra tabelas';
 $strShowThisQuery = ' Mostrar de novo aqui este comando ';
 $strShowingRecords = 'Mostrando registos ';
@@ -364,7 +364,7 @@ $strStrucData = 'Estrutura e dados';
 $strStrucDrop = 'Adiciona \'drop table\'';
 $strStrucExcelCSV = 'dados CSV para Ms Excel';
 $strStrucOnly = 'Somente estrutura';
-$strStructPropose = 'Propor uma estrutura de tabela';  
+$strStructPropose = 'Propor uma estrutura de tabela';
 $strStructure = 'Estrutura';
 $strSubmit = 'Submete';
 $strSuccess = 'O seu comando SQL foi executado com sucesso';
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3
index bfcbfcb19..83503f4a3 100644
--- a/lang/portuguese-utf-8.inc.php3
+++ b/lang/portuguese-utf-8.inc.php3
@@ -74,19 +74,19 @@ $strCantUseRecodeIconv = 'Não é possível usar <i>iconv</i> nem <i>libiconv</i
 $strCardinality = 'Quantidade';
 $strCarriage = 'Fim de linha: \\r';
 $strChange = 'Muda';
-$strChangeDisplay = 'Escolha campo para mostrar';  
+$strChangeDisplay = 'Escolha campo para mostrar';
 $strChangePassword = 'Alterar a senha';
 $strCheckAll = 'Todos';
 $strCheckDbPriv = 'Visualiza os Privilégios da Base de Dados';
 $strCheckTable = 'Verificar tabela';
-$strChoosePage = 'Escolha uma Página para editar';  
+$strChoosePage = 'Escolha uma Página para editar';
 $strColComFeat = 'Mostrando comentários das Colunas';
 $strColumn = 'Campo';
 $strColumnNames = 'Nome dos Campos';
-$strComments = 'Comentários';  
+$strComments = 'Comentários';
 $strCompleteInserts = 'Instrucções de inserção completas';
 $strConfigFileError = 'O phpMyAdmin não foi capaz de ler o ficheiro de configuração!<br />Isto pode acontecer se o php encontrar um erro no <i>parsing</i>  ou se não conseguir encontrar o ficheiro.<br />Chame o ficheiro de configuração directamente usando o <i>link</i> a baixo e leia a(s) mensagem(ns) de erro do php. Na maior parte dos casos, trata-se de uma falta de aspas ou de um ponto e vírgula algures.<br />Se receber uma página em branco, está tudo correcto.';
-$strConfigureTableCoord = 'Configure as cordenadas para a tabela %s';  
+$strConfigureTableCoord = 'Configure as cordenadas para a tabela %s';
 $strConfirm = 'Confirma a sua opção?';
 $strCookiesRequired = 'O mecanismo de "Cookies" tem de estar ligado a partir deste ponto.';
 $strCopyTable = 'Copia tabela para (base-de-dados<b>.</b>tabela):';
@@ -96,7 +96,7 @@ $strCreateIndex = 'Criar um índice com&nbsp;%s&nbsp;coluna(s)';
 $strCreateIndexTopic = 'Criar um novo índice';
 $strCreateNewDatabase = 'Criar nova base de dados';
 $strCreateNewTable = 'Criar nova tabela na base de dados %s';
-$strCreatePage = 'Criar uma Página nova';  
+$strCreatePage = 'Criar uma Página nova';
 $strCreatePdfFeat = 'Criação de PDFs';
 $strCriteria = 'Critérios';
 
@@ -118,7 +118,7 @@ $strDisabled = 'Desactidado';
 $strDisplay = 'Mostra';
 $strDisplayFeat = 'Mostrar Características';
 $strDisplayOrder = 'Ordem de visualização:';
-$strDisplayPDF = 'Mostrar o esquema de PDF';  
+$strDisplayPDF = 'Mostrar o esquema de PDF';
 $strDoAQuery = 'Faça uma "pesquisa por formulário" (caractere universal: "%")';
 $strDoYouReally = 'Confirma : ';
 $strDocu = 'Documentação';
@@ -130,7 +130,7 @@ $strDumpingData = 'Extraindo dados da tabela';
 $strDynamic = 'dinâmico';
 
 $strEdit = 'Edita';
-$strEditPDFPages = 'Editar páginas PDF';  
+$strEditPDFPages = 'Editar páginas PDF';
 $strEditPrivileges = 'Alterar Privilegios';
 $strEffective = 'Em uso';
 $strEmpty = 'Limpa';
@@ -158,7 +158,7 @@ $strFormat = 'Formato';
 $strFullText = 'Texto inteiro';
 $strFunction = 'Funções';
 
-$strGenBy = 'Gerado por'; 
+$strGenBy = 'Gerado por';
 $strGenTime = 'Data de Criação';
 $strGeneralRelationFeat = 'Características gerais de Relação';
 $strGo = 'Executa';
@@ -167,7 +167,7 @@ $strGzip = '"Compressão gzip"';
 
 $strHasBeenAltered = 'foi alterado(a).';
 $strHasBeenCreated = 'foi criado(a).';
-$strHaveToShow = 'Tem que escolher pelo menos uma coluna para mostrar';  
+$strHaveToShow = 'Tem que escolher pelo menos uma coluna para mostrar';
 $strHome = 'Início';
 $strHomepageOfficial = 'Página Oficial do phpMyAdmin';
 $strHomepageSourceforge = 'Sourceforge phpMyAdmin - Página de Download';
@@ -201,7 +201,7 @@ $strLimitNumRows = 'Número de registos por página';
 $strLineFeed = 'Mudança de linha: \\n';
 $strLines = 'Linhas';
 $strLinesTerminatedBy = 'Linhas terminadas por';
-$strLinkNotFound = 'Link não encontrado';  
+$strLinkNotFound = 'Link não encontrado';
 $strLinksTo = 'Links para';
 $strLocationTextfile = 'Localização do arquivo de texto';
 $strLogPassword = 'Senha&nbsp;:';
@@ -215,7 +215,7 @@ $strModify = 'Modifica';
 $strModifyIndexTopic = 'Modificar um índice';
 $strMoveTable = 'Move tabela para (base de dados<b>.</b>tabela):';
 $strMoveTableOK = 'A tabela %s foi movida para %s.';
-$strMySQLCharset = 'Mapa de Caracteres do mySQL';  
+$strMySQLCharset = 'Mapa de Caracteres do mySQL';
 $strMySQLReloaded = 'MySQL reiniciado.';
 $strMySQLSaid = 'Mensagens do MySQL : ';
 $strMySQLServerProcess = 'MySQL %pma_s1% a correr em %pma_s2% como %pma_s3%';
@@ -227,14 +227,14 @@ $strName = 'Nome';
 $strNext = 'Próximo';
 $strNo = 'Não';
 $strNoDatabases = 'Sem bases de dados';
-$strNoDescription = 'sem Descrição';  
+$strNoDescription = 'sem Descrição';
 $strNoDropDatabases = 'Os comandos "DROP DATABASE" estão inibidos.';
 $strNoFrames = 'O phpMyAdmin torna-se mais agradável se usado num browser que suporte <b>frames</b>.';
 $strNoIndex = 'Nenhum indíce definido!';
 $strNoIndexPartsDefined = 'Nenhuma parte do índice definida!';
 $strNoModification = 'Sem alterações';
 $strNoPassword = 'Sem Senha';
-$strNoPhp = 'sem código PHP';  
+$strNoPhp = 'sem código PHP';
 $strNoPrivileges = 'Sem Privilégios';
 $strNoQuery = 'Nenhum comando SQL encontrado!';
 $strNoRights = 'Não tem permissões suficientes para aceder aqui, neste momento!';
@@ -243,7 +243,7 @@ $strNoUsersFound = 'Nenhum utilizador encontrado.';
 $strNone = 'Nenhum';
 $strNotNumber = 'Isto não é um número!';
 $strNotOK = 'não está OK';
-$strNotSet = 'A Tabela <b>%s</b> não foi encontrada ou não foi definida em %s';  
+$strNotSet = 'A Tabela <b>%s</b> não foi encontrada ou não foi definida em %s';
 $strNotValidNumber = ' não é um número de registo válido!';
 $strNull = 'Nulo';
 $strNumSearchResultsInTable = '%s resultado(s) na tabela <i>%s</i>';
@@ -260,16 +260,16 @@ $strOr = 'Ou';
 $strOverhead = 'Suspenso';
 
 $strPHPVersion = 'versão do PHP';
-$strPageNumber = 'Página número:';  
+$strPageNumber = 'Página número:';
 $strPartialText = 'Texto parcial';
 $strPassword = 'Senha';
 $strPasswordEmpty = 'Indique a Senha!';
 $strPasswordNotSame = 'As senhas são diferentes!\nLembre-se de confirmar a senha!';
-$strPdfDbSchema = 'Esquema da base de dados "%s" - Página %s';  
-$strPdfInvalidPageNum = 'Numero da página do PDF indefinido!';  
-$strPdfInvalidTblName = 'A tabela "%s" não existe!';  
+$strPdfDbSchema = 'Esquema da base de dados "%s" - Página %s';
+$strPdfInvalidPageNum = 'Numero da página do PDF indefinido!';
+$strPdfInvalidTblName = 'A tabela "%s" não existe!';
 $strPdfNoTables = 'Sem tablelas';
-$strPhp = 'Criar código PHP';  
+$strPhp = 'Criar código PHP';
 $strPmaDocumentation = 'Documentação do phpMyAdmin';
 $strPmaUriError = 'A directiva <tt>$cfg[\'PmaAbsoluteUri\']</tt> TEM que ser definida no ficheiro de configuração!';
 $strPos1 = 'Inicio';
@@ -292,7 +292,7 @@ $strReType = 'Confirma';
 $strRecords = 'Registos';
 $strReferentialIntegrity = 'Verificar Integridade referencial:';
 $strRelationNotWorking = 'As Características adicionais para trabalhar com ligações entre Tabelas foram desactivadas. Para saber porquê carregue %saqui%s.';
-$strRelationView = 'Vista de Relação';  
+$strRelationView = 'Vista de Relação';
 $strReloadFailed = 'Reiniciação do MySQL falhou.';
 $strReloadMySQL = 'Reiniciar o MySQL';
 $strRememberReload = 'Lembre-se de reiniciar o servidor.';
@@ -321,9 +321,9 @@ $strRunning = 'a correr em %s';
 
 $strSQL = 'SQL';
 $strSQLQuery = 'Comando SQL';
-$strSQLResult = 'Resultado SQL'; 
+$strSQLResult = 'Resultado SQL';
 $strSave = 'Guarda';
-$strScaleFactorSmall = 'O factor escala é muito pequeno para encaixar o esquema numa página';  
+$strScaleFactorSmall = 'O factor escala é muito pequeno para encaixar o esquema numa página';
 $strSearch = 'Pesquisar';
 $strSearchFormTitle = 'Pesquisar na Base de Dados';
 $strSearchInTables = 'Dentro de Tabela(s):';
@@ -339,18 +339,18 @@ $strSelectADb = 'Por favor seleccione uma base de dados';
 $strSelectAll = 'Selecciona Todas';
 $strSelectFields = 'Seleccione os campos (no mínimo 1)';
 $strSelectNumRows = 'na pesquisa';
-$strSelectTables = 'Seleccionar Tabelas';  
+$strSelectTables = 'Seleccionar Tabelas';
 $strSend = 'envia';
 $strServerChoice = 'Escolha do Servidor';
 $strServerVersion = 'Versão do servidor';
 $strSetEnumVal = 'Se o tipo de campo é "enum" ou "set", por favor introduza os valores no seguinte formato: \'a\',\'b\',\'c\'...<br />Se precisar de colocar uma barra invertida ("\") ou um apóstrofe ("\'") entre esses valores, coloque uma barra invertida antes (por exemplo \'\\\\xyz\' ou \'a\\\'b\').';
 $strShow = 'Mostra';
 $strShowAll = 'Mostrar tudo';
-$strShowColor = 'Mostrar côr';  
+$strShowColor = 'Mostrar côr';
 $strShowCols = 'Mostra Colunas';
-$strShowGrid = 'Mostrar grelha';  
+$strShowGrid = 'Mostrar grelha';
 $strShowPHPInfo = 'Mostra informação do PHP';
-$strShowTableDimension = 'Mostrar dimensão das tabelas';  
+$strShowTableDimension = 'Mostrar dimensão das tabelas';
 $strShowTables = 'Mostra tabelas';
 $strShowThisQuery = ' Mostrar de novo aqui este comando ';
 $strShowingRecords = 'Mostrando registos ';
@@ -365,7 +365,7 @@ $strStrucData = 'Estrutura e dados';
 $strStrucDrop = 'Adiciona \'drop table\'';
 $strStrucExcelCSV = 'dados CSV para Ms Excel';
 $strStrucOnly = 'Somente estrutura';
-$strStructPropose = 'Propor uma estrutura de tabela';  
+$strStructPropose = 'Propor uma estrutura de tabela';
 $strStructure = 'Estrutura';
 $strSubmit = 'Submete';
 $strSuccess = 'O seu comando SQL foi executado com sucesso';
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3
index 05bb653b1..44117b132 100644
--- a/lang/romanian-iso-8859-1.inc.php3
+++ b/lang/romanian-iso-8859-1.inc.php3
@@ -414,4 +414,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3
index 653b7f4ac..2e5d1097b 100644
--- a/lang/russian-koi8-r.inc.php3
+++ b/lang/russian-koi8-r.inc.php3
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3
index 6d1c54417..cb1c529d5 100644
--- a/lang/russian-utf-8.inc.php3
+++ b/lang/russian-utf-8.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3
index 5bc7310b4..17fb07aee 100644
--- a/lang/russian-windows-1251.inc.php3
+++ b/lang/russian-windows-1251.inc.php3
@@ -418,4 +418,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3
index 16c865376..54c683a8d 100644
--- a/lang/serbian-utf-8.inc.php3
+++ b/lang/serbian-utf-8.inc.php3
@@ -421,4 +421,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3
index e76043af9..29503c3ed 100644
--- a/lang/serbian-windows-1250.inc.php3
+++ b/lang/serbian-windows-1250.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3
index 5c09a0dbf..cf295672e 100644
--- a/lang/slovak-iso-8859-2.inc.php3
+++ b/lang/slovak-iso-8859-2.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3
index d034741ff..a9c965e20 100644
--- a/lang/slovak-utf-8.inc.php3
+++ b/lang/slovak-utf-8.inc.php3
@@ -420,4 +420,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3
index bcc5f18f7..6c91d6507 100644
--- a/lang/slovak-windows-1250.inc.php3
+++ b/lang/slovak-windows-1250.inc.php3
@@ -419,4 +419,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3
index ccb8bacfd..88e356ba3 100644
--- a/lang/slovenian-iso-8859-2.inc.php3
+++ b/lang/slovenian-iso-8859-2.inc.php3
@@ -417,4 +417,5 @@ $strYes = 'Da';
 $strZip = '"zipano"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3
index 10b981348..56f3bf766 100644
--- a/lang/slovenian-utf-8.inc.php3
+++ b/lang/slovenian-utf-8.inc.php3
@@ -417,4 +417,5 @@ $strYes = 'Da';
 $strZip = '"zipano"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3
index 1062fc079..5d8b86c22 100644
--- a/lang/slovenian-windows-1250.inc.php3
+++ b/lang/slovenian-windows-1250.inc.php3
@@ -417,4 +417,5 @@ $strYes = 'Da';
 $strZip = '"zipano"';
 
 // To translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3
index 54b09655f..d7aa2c3e3 100644
--- a/lang/spanish-iso-8859-1.inc.php3
+++ b/lang/spanish-iso-8859-1.inc.php3
@@ -74,9 +74,9 @@ $strCheckTable = 'Revisar tabla';
 $strChoosePage = 'Elija la página a editar';
 $strColumn = 'Columna';
 $strColumnNames = 'Nombre de las columnas';
-$strComments = 'Comentarios'; 
+$strComments = 'Comentarios';
 $strCompleteInserts = 'Completar los "Inserts"';
-$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.'; 
+$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.';
 $strConfigureTableCoord = 'Configure las coordenadas para la tabla %s';
 $strConfirm = '¿Realmente quiere hacerlo?';
 $strCookiesRequired = 'Las "cookies" deben estar habilitadas pasado este punto.';
@@ -227,7 +227,7 @@ $strNoTablesFound = 'No se han encontrado tablas en la base de datos.';
 $strNoUsersFound = 'Usuario(s) no encontrado(s).';
 $strNone = 'Ninguna';
 $strNotNumber = 'Esto no es un número!';
-$strNotSet = 'Tabla <b>%s</b> no encontrada o no definida en %s'; 
+$strNotSet = 'Tabla <b>%s</b> no encontrada o no definida en %s';
 $strNotValidNumber = '¡no es un número de fila válido!';
 $strNull = 'Nulo';
 $strNumSearchResultsInTable = '%s resultado(s) en la tabla <i>%s</i>';
@@ -398,17 +398,18 @@ $strZip = '"comprimido con zip"';
 
 $strRelationNotWorking = 'Los componentes adicionales para trabajar con tablas vinculadas fueron desactivados. Para saber porqué, dé clic %saquí%s.';  //Features = ¿componentes?
 $strAllTableSameWidth = '¿Mostrar todas las tablas que tienen el mismo ancho?';
-$strPdfNoTables = 'No existen tablas';  
+$strPdfNoTables = 'No existen tablas';
 $strDisplayFeat = 'Mostrar los componentes';  //Features = ¿componentes?
-$strCreatePdfFeat = 'Creación de los PDF';  
-$strColComFeat = 'Mostrando los comentarios de la columna';  
+$strCreatePdfFeat = 'Creación de los PDF';
+$strColComFeat = 'Mostrando los comentarios de la columna';
 $strDisabled = 'Deshabilitado';
 $strEnabled = 'Habilitado';
-$strOK = 'OK';  
+$strOK = 'OK';
 $strNotOK = 'no recibió el OK';
 $strGeneralRelationFeat = 'Componentes de relación general';  //Features = ¿componentes?
 $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3
index 04cf38d61..9b9bc6f75 100644
--- a/lang/spanish-utf-8.inc.php3
+++ b/lang/spanish-utf-8.inc.php3
@@ -75,9 +75,9 @@ $strCheckTable = 'Revisar tabla';
 $strChoosePage = 'Elija la página a editar';
 $strColumn = 'Columna';
 $strColumnNames = 'Nombre de las columnas';
-$strComments = 'Comentarios'; 
+$strComments = 'Comentarios';
 $strCompleteInserts = 'Completar los "Inserts"';
-$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.'; 
+$strConfigFileError = '¡phpMyAdmin no puede leer el fichero de configuración!<br />Esto puede suceder si php encuentra un error sintáctico en él o bien php no puede encontrar el fichero.<br />Intente acceder al fichero de configuración directamente mediante el siguiente enlace y compruebe el(los) mensaje(s) de error que reciba. En muchas ocasiones falta una coma o punto y coma en algún sitio.<br />Si recibe una página en blanco, todo está correcto.';
 $strConfigureTableCoord = 'Configure las coordenadas para la tabla %s';
 $strConfirm = '¿Realmente quiere hacerlo?';
 $strCookiesRequired = 'Las "cookies" deben estar habilitadas pasado este punto.';
@@ -228,7 +228,7 @@ $strNoTablesFound = 'No se han encontrado tablas en la base de datos.';
 $strNoUsersFound = 'Usuario(s) no encontrado(s).';
 $strNone = 'Ninguna';
 $strNotNumber = 'Esto no es un número!';
-$strNotSet = 'Tabla <b>%s</b> no encontrada o no definida en %s'; 
+$strNotSet = 'Tabla <b>%s</b> no encontrada o no definida en %s';
 $strNotValidNumber = '¡no es un número de fila válido!';
 $strNull = 'Nulo';
 $strNumSearchResultsInTable = '%s resultado(s) en la tabla <i>%s</i>';
@@ -399,17 +399,18 @@ $strZip = '"comprimido con zip"';
 
 $strRelationNotWorking = 'Los componentes adicionales para trabajar con tablas vinculadas fueron desactivados. Para saber porqué, dé clic %saquí%s.';  //Features = ¿componentes?
 $strAllTableSameWidth = '¿Mostrar todas las tablas que tienen el mismo ancho?';
-$strPdfNoTables = 'No existen tablas';  
+$strPdfNoTables = 'No existen tablas';
 $strDisplayFeat = 'Mostrar los componentes';  //Features = ¿componentes?
-$strCreatePdfFeat = 'Creación de los PDF';  
-$strColComFeat = 'Mostrando los comentarios de la columna';  
+$strCreatePdfFeat = 'Creación de los PDF';
+$strColComFeat = 'Mostrando los comentarios de la columna';
 $strDisabled = 'Deshabilitado';
 $strEnabled = 'Habilitado';
-$strOK = 'OK';  
+$strOK = 'OK';
 $strNotOK = 'no recibió el OK';
 $strGeneralRelationFeat = 'Componentes de relación general';  //Features = ¿componentes?
 $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3
index 3eb739270..dbfd8966a 100644
--- a/lang/swedish-iso-8859-1.inc.php3
+++ b/lang/swedish-iso-8859-1.inc.php3
@@ -415,4 +415,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3
index e8ba96c59..8c1075a99 100644
--- a/lang/swedish-utf-8.inc.php3
+++ b/lang/swedish-utf-8.inc.php3
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3
index 206fd6ee1..dcb0c87e6 100644
--- a/lang/thai-tis-620.inc.php3
+++ b/lang/thai-tis-620.inc.php3
@@ -36,7 +36,7 @@ $strAfter = '
 $strAfterInsertBack = 'Ê觡ÅѺ';
 $strAfterInsertNewInsert = 'á·Ã¡ÃÐàºÕ¹ãËÁè';
 $strAll = '·Ñé§ËÁ´';
-$strAllTableSameWidth = 'ãËéáÊ´§µÒÃÒ§·Ø¡µÒÃÒ§´éǤÇÒÁ¡ÇéÒ§à·èҡѹËÃ×ÍäÁè?'; 
+$strAllTableSameWidth = 'ãËéáÊ´§µÒÃÒ§·Ø¡µÒÃÒ§´éǤÇÒÁ¡ÇéÒ§à·èҡѹËÃ×ÍäÁè?';
 $strAlterOrderBy = 'àÃÕ§¤èÒã¹µÒÃÒ§µÒÁ';
 $strAnalyzeTable = 'ÇÔà¤ÃÒÐËìµÒÃÒ§';
 $strAnd = 'áÅÐ';
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3
index b735a5f69..2fb0501d8 100644
--- a/lang/thai-utf-8.inc.php3
+++ b/lang/thai-utf-8.inc.php3
@@ -37,7 +37,7 @@ $strAfter = 'หลัง %s';
 $strAfterInsertBack = 'ส่ง�ลับ';
 $strAfterInsertNewInsert = '�ทร�ระเบียนใหม่';
 $strAll = 'ทั้งหมด';
-$strAllTableSameWidth = 'ให้�สดงตารางทุ�ตารางด้วยความ�ว้างเท่า�ันหรือไม่?'; 
+$strAllTableSameWidth = 'ให้�สดงตารางทุ�ตารางด้วยความ�ว้างเท่า�ันหรือไม่?';
 $strAlterOrderBy = 'เรียงค่าในตารางตาม';
 $strAnalyzeTable = 'วิเคราะห์ตาราง';
 $strAnd = '�ละ';
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3
index b96fdbbe4..6dae98f0d 100644
--- a/lang/turkish-iso-8859-9.inc.php3
+++ b/lang/turkish-iso-8859-9.inc.php3
@@ -64,7 +64,7 @@ $strBrowse = 'Tara';
 $strBzip = '"bzipped"';
 
 $strCantLoadMySQL = 'mySQL uzantýsýný yükleyemiyor,<br />lütfen PHP ayarlarýný kontrol ediniz.';
-$strCantLoadRecodeIconv = 'Karakter seti dönüþümü için gerekli olan Iconv veya recode uzantýlarýný yükleyenemiyor.  Php\'nin bu uzantýlara izin vermesini saðlayýn veya phpMyAdmin içinde karakter dönüþümünü devre dýþý býrakýnýz...'; 
+$strCantLoadRecodeIconv = 'Karakter seti dönüþümü için gerekli olan Iconv veya recode uzantýlarýný yükleyenemiyor.  Php\'nin bu uzantýlara izin vermesini saðlayýn veya phpMyAdmin içinde karakter dönüþümünü devre dýþý býrakýnýz...';
 $strCantRenameIdxToPrimary = 'Index\'i PRIMARY olarak adland&#305;r&#305;mazs&#305;n&#305;z!';
 $strCantUseRecodeIconv = 'Uzantý raporlarý yüklenmiþken , ne iconv ne libinconv ne de recode_string fonksiyonu  kullanýlamaz.  Php ayarlarýnýzý kontrol ediniz.';
 $strCardinality = 'En önemli';
@@ -76,12 +76,12 @@ $strCheckAll = 'T
 $strCheckDbPriv = 'Veritabaný önceliklerini kontrol et';
 $strCheckTable = 'Tabloyu kontrol et';
 $strChoosePage = 'Lütfen düzenlemek istediðiniz sayfayý seçin';
-$strColComFeat = 'Sütun yorumlarý gösteriliyor';  
+$strColComFeat = 'Sütun yorumlarý gösteriliyor';
 $strColumn = 'Sütun';
 $strColumnNames = 'Sütun adlarý';
-$strComments = 'Yorumlar'; 
+$strComments = 'Yorumlar';
 $strCompleteInserts = 'Tamamlanmýþ eklemeler';
-$strConfigFileError ='phpMyAdmin konfigurasyon dosyanýzý okuyamadý....<br /> Bu php yorumlama hatasý bulduðu zaman veya dosyayý bulamadýðý zaman meydana gelebilir..<br /> Lütfen aþaðýdaki linki kullanarak dosyayý direkt olarak çaðýrýn ve aldýðýnýz php hata mesajlarýný okuyunuz.Çoðu durumda herhangi bir yerde týrnak veya noktalý virgül eksiktir<br /> Boþ bir sayfayla karþýlaþýrsanýz ,herþey yolunda demektir.'; 
+$strConfigFileError ='phpMyAdmin konfigurasyon dosyanýzý okuyamadý....<br /> Bu php yorumlama hatasý bulduðu zaman veya dosyayý bulamadýðý zaman meydana gelebilir..<br /> Lütfen aþaðýdaki linki kullanarak dosyayý direkt olarak çaðýrýn ve aldýðýnýz php hata mesajlarýný okuyunuz.Çoðu durumda herhangi bir yerde týrnak veya noktalý virgül eksiktir<br /> Boþ bir sayfayla karþýlaþýrsanýz ,herþey yolunda demektir.';
 $strConfigureTableCoord = ' Lütfen %s tablosu için koordinatlarý yapýlandýrýnýz';
 $strConfirm = 'Aþaðýdaki komutu uygulamak istediðinizden emin misiniz?';
 $strCookiesRequired = 'Cookieler aç&#305;k olmal&#305;d&#305;r.';
@@ -93,7 +93,7 @@ $strCreateIndexTopic = 'Yeni bir index olu&#351;tur';
 $strCreateNewDatabase = 'Yeni veritabaný oluþtur';
 $strCreateNewTable = '%s veritabaný üzerinde yeni bir tablo oluþtur';
 $strCreatePage = 'Yeni sayfa oluþtur';
-$strCreatePdfFeat = 'PDF\'lerin oluþturulmasý';  
+$strCreatePdfFeat = 'PDF\'lerin oluþturulmasý';
 $strCriteria = 'Kriter';
 
 $strData = 'Veri';
@@ -110,9 +110,9 @@ $strDeletedRows = 'Silinen sat
 $strDeleteFailed = 'Silme sýrasýnda hata oluþtu!';
 $strDeleteUserMessage = '%s kullanýcýsýný sildiniz.';
 $strDescending = 'Azalan';
-$strDisabled = 'Etkin deðil';  
+$strDisabled = 'Etkin deðil';
 $strDisplay = 'Görüntüle';
-$strDisplayFeat = 'Özellikleri Göster';  
+$strDisplayFeat = 'Özellikleri Göster';
 $strDisplayOrder = 'Görünüm düzeni:';
 $strDisplayPDF = 'PDF þemasýný göster';
 $strDoAQuery = '"Örnekle sorgu" yap (joker: "%")';
@@ -131,7 +131,7 @@ $strEditPrivileges = '
 $strEffective = 'Efektif';
 $strEmpty = 'Boþalt';
 $strEmptyResultSet = 'MySQL boþ bir sonuc kümesi döndürdü ( sýfýr satýr).';
-$strEnabled = 'Etkin'; 
+$strEnabled = 'Etkin';
 $strEnd = 'Son';
 $strEnglishPrivileges = ' Not: mySQL  öncelik adlarý Ýngilizce olarak belirtilmiþtir ';
 $strError = 'Hata';
@@ -155,7 +155,7 @@ $strFullText = 'T
 $strFunction = 'Fonksiyon';
 
 $strGenBy = 'Oluþturuldu->:';
-$strGeneralRelationFeat = 'Genel iliþki özellikleri'; 
+$strGeneralRelationFeat = 'Genel iliþki özellikleri';
 $strGenTime = 'Çýktý Tarihi';
 $strGo = 'Git';
 $strGrants = 'Haklar';
@@ -163,7 +163,7 @@ $strGzip = '"gziplenmi
 
 $strHasBeenAltered = 'düzenlendi.';
 $strHasBeenCreated = 'yaratýldý.';
-$strHaveToShow = 'Görüntülemek için en az bir sütun seçmelisiniz'; 
+$strHaveToShow = 'Görüntülemek için en az bir sütun seçmelisiniz';
 $strHome = 'Ana Sayfa';
 $strHomepageOfficial = 'phpMyAdmin Web Sayfasý';
 $strHomepageSourceforge = 'Sourceforge phpMyAdmin Yükleme Sayfasý';
@@ -205,13 +205,13 @@ $strLogout = '
 $strLogPassword = '&#350;ifre:';
 $strLogUsername = 'Kullan&#305;c&#305; Ad&#305;:';
 
-$strMissingBracket = 'Parantez eksik'; 
+$strMissingBracket = 'Parantez eksik';
 $strModifications = 'Deðiþiklikler kaydedildi';
 $strModify = 'Deðiþtir';
 $strModifyIndexTopic = 'Index düzenle';
 $strMoveTable = 'Tabloyu (veritabaný<b>.</b>tablo) taþý:';
 $strMoveTableOK = '%s tablosu %s üzerine taþýndý.';
-$strMySQLCharset = 'MySQL karakter seti'; 
+$strMySQLCharset = 'MySQL karakter seti';
 $strMySQLReloaded = 'MySQL yeniden yüklendi.';
 $strMySQLSaid = 'MySQL çýktýsý: ';
 $strMySQLServerProcess = ' MySQL %pma_s1%   %pma_s2%  üzerinde  %pma_s3% olarak çalýþýyor';
@@ -237,7 +237,7 @@ $strNoQuery = 'SQL sorgusu yok!';
 $strNoRights = 'Burada bulunmak için yeterli haklara sahip deðilsiniz!';
 $strNoTablesFound = 'Veritabaný\'nda tablo bulunamadý.';
 $strNotNumber = 'Bu bir sayý deðil!';
-$strNotOK = 'Tamam deðil';  
+$strNotOK = 'Tamam deðil';
 $strNotSet = '<b>%s</b> tablosu bulunamadý veya %s içinde tanýmlanmadý';
 $strNotValidNumber = ' geçerli bir satýr sayýsý deðil!';
 $strNoUsersFound = 'Kullanýcý(lar) bulunamadý.';
@@ -246,7 +246,7 @@ $strNumSearchResultsInTable = '%s e
 $strNumSearchResultsTotal = 'Toplam: %s eþleþim';
 
 $strOftenQuotation = 'Sýk kullanýlan aktarma iþaretleri.SEÇÝME BAÐLI,sadece char ve varchar alanlarýnýn "enclosed-by" karakteri ile çevreneleceði anlamýna gelir..';
-$strOK = 'Tamam';  
+$strOK = 'Tamam';
 $strOperations = 'Ýþlemler';
 $strOptimizeTable = 'Tabloyu optimize et';
 $strOptionalControls = 'Özel karakterleri yazmak ve okumak için kontroller.Opsiyonel';
@@ -360,7 +360,7 @@ $strStrucData = 'Yap
 $strStrucDrop = '\'Drop table\' ekle';
 $strStrucExcelCSV = 'MS Excel verisi için CSV';
 $strStrucOnly = 'Sadece yapý';
-$strStructPropose = 'Tablo yapýsýný ayarla(mysql,tablo yapýsýný optimize eder)'; 
+$strStructPropose = 'Tablo yapýsýný ayarla(mysql,tablo yapýsýný optimize eder)';
 $strStructure = 'Yapý';
 $strSubmit = 'Onayla';
 $strSuccess = 'SQL sorgunuz baþarýyla çalýþtýrýlmýþtýr';
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3
index c97ff9e46..d54f31a38 100644
--- a/lang/turkish-utf-8.inc.php3
+++ b/lang/turkish-utf-8.inc.php3
@@ -65,7 +65,7 @@ $strBrowse = 'Tara';
 $strBzip = '"bzipped"';
 
 $strCantLoadMySQL = 'mySQL uzantısını yükleyemiyor,<br />lütfen PHP ayarlarını kontrol ediniz.';
-$strCantLoadRecodeIconv = 'Karakter seti dönüşümü için gerekli olan Iconv veya recode uzantılarını yükleyenemiyor.  Php\'nin bu uzantılara izin vermesini sağlayın veya phpMyAdmin içinde karakter dönüşümünü devre dışı bırakınız...'; 
+$strCantLoadRecodeIconv = 'Karakter seti dönüşümü için gerekli olan Iconv veya recode uzantılarını yükleyenemiyor.  Php\'nin bu uzantılara izin vermesini sağlayın veya phpMyAdmin içinde karakter dönüşümünü devre dışı bırakınız...';
 $strCantRenameIdxToPrimary = 'Index\'i PRIMARY olarak adland&#305;r&#305;mazs&#305;n&#305;z!';
 $strCantUseRecodeIconv = 'Uzantı raporları yüklenmişken , ne iconv ne libinconv ne de recode_string fonksiyonu  kullanılamaz.  Php ayarlarınızı kontrol ediniz.';
 $strCardinality = 'En önemli';
@@ -77,12 +77,12 @@ $strCheckAll = 'Tümünü seç';
 $strCheckDbPriv = 'Veritabanı önceliklerini kontrol et';
 $strCheckTable = 'Tabloyu kontrol et';
 $strChoosePage = 'Lütfen düzenlemek istediğiniz sayfayı seçin';
-$strColComFeat = 'Sütun yorumları gösteriliyor';  
+$strColComFeat = 'Sütun yorumları gösteriliyor';
 $strColumn = 'Sütun';
 $strColumnNames = 'Sütun adları';
-$strComments = 'Yorumlar'; 
+$strComments = 'Yorumlar';
 $strCompleteInserts = 'Tamamlanmış eklemeler';
-$strConfigFileError ='phpMyAdmin konfigurasyon dosyanızı okuyamadı....<br /> Bu php yorumlama hatası bulduğu zaman veya dosyayı bulamadığı zaman meydana gelebilir..<br /> Lütfen aşağıdaki linki kullanarak dosyayı direkt olarak çağırın ve aldığınız php hata mesajlarını okuyunuz.Çoğu durumda herhangi bir yerde tırnak veya noktalı virgül eksiktir<br /> Boş bir sayfayla karşılaşırsanız ,herşey yolunda demektir.'; 
+$strConfigFileError ='phpMyAdmin konfigurasyon dosyanızı okuyamadı....<br /> Bu php yorumlama hatası bulduğu zaman veya dosyayı bulamadığı zaman meydana gelebilir..<br /> Lütfen aşağıdaki linki kullanarak dosyayı direkt olarak çağırın ve aldığınız php hata mesajlarını okuyunuz.Çoğu durumda herhangi bir yerde tırnak veya noktalı virgül eksiktir<br /> Boş bir sayfayla karşılaşırsanız ,herşey yolunda demektir.';
 $strConfigureTableCoord = ' Lütfen %s tablosu için koordinatları yapılandırınız';
 $strConfirm = 'Aşağıdaki komutu uygulamak istediğinizden emin misiniz?';
 $strCookiesRequired = 'Cookieler aç&#305;k olmal&#305;d&#305;r.';
@@ -94,7 +94,7 @@ $strCreateIndexTopic = 'Yeni bir index olu&#351;tur';
 $strCreateNewDatabase = 'Yeni veritabanı oluştur';
 $strCreateNewTable = '%s veritabanı üzerinde yeni bir tablo oluştur';
 $strCreatePage = 'Yeni sayfa oluÅŸtur';
-$strCreatePdfFeat = 'PDF\'lerin oluşturulması';  
+$strCreatePdfFeat = 'PDF\'lerin oluşturulması';
 $strCriteria = 'Kriter';
 
 $strData = 'Veri';
@@ -111,9 +111,9 @@ $strDeletedRows = 'Silinen satırlar:';
 $strDeleteFailed = 'Silme sırasında hata oluştu!';
 $strDeleteUserMessage = '%s kullanıcısını sildiniz.';
 $strDescending = 'Azalan';
-$strDisabled = 'Etkin deÄŸil';  
+$strDisabled = 'Etkin deÄŸil';
 $strDisplay = 'Görüntüle';
-$strDisplayFeat = 'Özellikleri Göster';  
+$strDisplayFeat = 'Özellikleri Göster';
 $strDisplayOrder = 'Görünüm düzeni:';
 $strDisplayPDF = 'PDF şemasını göster';
 $strDoAQuery = '"Örnekle sorgu" yap (joker: "%")';
@@ -132,7 +132,7 @@ $strEditPrivileges = 'Öncelikleri Düzenle';
 $strEffective = 'Efektif';
 $strEmpty = 'BoÅŸalt';
 $strEmptyResultSet = 'MySQL boş bir sonuc kümesi döndürdü ( sıfır satır).';
-$strEnabled = 'Etkin'; 
+$strEnabled = 'Etkin';
 $strEnd = 'Son';
 $strEnglishPrivileges = ' Not: mySQL  öncelik adları İngilizce olarak belirtilmiştir ';
 $strError = 'Hata';
@@ -156,7 +156,7 @@ $strFullText = 'Tüm metinler';
 $strFunction = 'Fonksiyon';
 
 $strGenBy = 'OluÅŸturuldu->:';
-$strGeneralRelationFeat = 'Genel ilişki özellikleri'; 
+$strGeneralRelationFeat = 'Genel ilişki özellikleri';
 $strGenTime = 'Çıktı Tarihi';
 $strGo = 'Git';
 $strGrants = 'Haklar';
@@ -164,7 +164,7 @@ $strGzip = '"gziplenmiÅŸ"';
 
 $strHasBeenAltered = 'düzenlendi.';
 $strHasBeenCreated = 'yaratıldı.';
-$strHaveToShow = 'Görüntülemek için en az bir sütun seçmelisiniz'; 
+$strHaveToShow = 'Görüntülemek için en az bir sütun seçmelisiniz';
 $strHome = 'Ana Sayfa';
 $strHomepageOfficial = 'phpMyAdmin Web Sayfası';
 $strHomepageSourceforge = 'Sourceforge phpMyAdmin Yükleme Sayfası';
@@ -206,13 +206,13 @@ $strLogout = 'Çıkış';
 $strLogPassword = '&#350;ifre:';
 $strLogUsername = 'Kullan&#305;c&#305; Ad&#305;:';
 
-$strMissingBracket = 'Parantez eksik'; 
+$strMissingBracket = 'Parantez eksik';
 $strModifications = 'DeÄŸiÅŸiklikler kaydedildi';
 $strModify = 'DeÄŸiÅŸtir';
 $strModifyIndexTopic = 'Index düzenle';
 $strMoveTable = 'Tabloyu (veritabanı<b>.</b>tablo) taşı:';
 $strMoveTableOK = '%s tablosu %s üzerine taşındı.';
-$strMySQLCharset = 'MySQL karakter seti'; 
+$strMySQLCharset = 'MySQL karakter seti';
 $strMySQLReloaded = 'MySQL yeniden yüklendi.';
 $strMySQLSaid = 'MySQL çıktısı: ';
 $strMySQLServerProcess = ' MySQL %pma_s1%   %pma_s2%  üzerinde  %pma_s3% olarak çalışıyor';
@@ -238,7 +238,7 @@ $strNoQuery = 'SQL sorgusu yok!';
 $strNoRights = 'Burada bulunmak için yeterli haklara sahip değilsiniz!';
 $strNoTablesFound = 'Veritabanı\'nda tablo bulunamadı.';
 $strNotNumber = 'Bu bir sayı değil!';
-$strNotOK = 'Tamam deÄŸil';  
+$strNotOK = 'Tamam deÄŸil';
 $strNotSet = '<b>%s</b> tablosu bulunamadı veya %s içinde tanımlanmadı';
 $strNotValidNumber = ' geçerli bir satır sayısı değil!';
 $strNoUsersFound = 'Kullanıcı(lar) bulunamadı.';
@@ -247,7 +247,7 @@ $strNumSearchResultsInTable = '%s eşleşim : %s tablosu içinde';
 $strNumSearchResultsTotal = 'Toplam: %s eÅŸleÅŸim';
 
 $strOftenQuotation = 'Sık kullanılan aktarma işaretleri.SEÇİME BAĞLI,sadece char ve varchar alanlarının "enclosed-by" karakteri ile çevreneleceği anlamına gelir..';
-$strOK = 'Tamam';  
+$strOK = 'Tamam';
 $strOperations = 'Ä°ÅŸlemler';
 $strOptimizeTable = 'Tabloyu optimize et';
 $strOptionalControls = 'Özel karakterleri yazmak ve okumak için kontroller.Opsiyonel';
@@ -361,7 +361,7 @@ $strStrucData = 'Yapı ve Veri';
 $strStrucDrop = '\'Drop table\' ekle';
 $strStrucExcelCSV = 'MS Excel verisi için CSV';
 $strStrucOnly = 'Sadece yapı';
-$strStructPropose = 'Tablo yapısını ayarla(mysql,tablo yapısını optimize eder)'; 
+$strStructPropose = 'Tablo yapısını ayarla(mysql,tablo yapısını optimize eder)';
 $strStructure = 'Yapı';
 $strSubmit = 'Onayla';
 $strSuccess = 'SQL sorgunuz başarıyla çalıştırılmıştır';
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3
index 494b904f3..9a6c11dc0 100644
--- a/lang/ukrainian-utf-8.inc.php3
+++ b/lang/ukrainian-utf-8.inc.php3
@@ -417,4 +417,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3
index 9f0ac3645..93e3f8239 100644
--- a/lang/ukrainian-windows-1251.inc.php3
+++ b/lang/ukrainian-windows-1251.inc.php3
@@ -416,4 +416,5 @@ $strNoValidateSQL = 'Skip Validate SQL';  //to translate
 $strValidateSQL = 'Validate SQL';  //to translate
 $strNoExplain = 'Skip Explain SQL';  //to translate
 $strExplain = 'Explain SQL';  //to translate
+$strCharsetOfFile = 'Character set of the file:'; //to translate
 ?>
diff --git a/read_dump.php3 b/read_dump.php3
index f6fc5dca9..b404d1108 100644
--- a/read_dump.php3
+++ b/read_dump.php3
@@ -274,6 +274,10 @@ if ($sql_file != 'none') {
         if (get_magic_quotes_runtime() == 1) {
             $sql_query = stripslashes($sql_query);
         }
+        // Convert the file's charset if necessary
+        if ($cfg['AllowAnywhereRecoding'] && $allow_recoding && isset($charset_of_file) && $charset_of_file != $charset) {
+            $sql_query = iconv($charset_of_file, $charset, $sql_query);
+        }
     }
 }
 else if (empty($id_bookmark) && get_magic_quotes_gpc() == 1) {
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 300870227..5a482e68e 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -95,6 +95,26 @@ if ($is_upload) {
     ?>
             <div style="margin-bottom: 5px">
             <input type="file" name="sql_file" class="textfield" /><br />
+<?php
+    if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
+        $temp_charset = reset($cfg['AvailableCharsets']);
+        echo $strCharsetOfFile . "\n"
+           . '            <select name="charset_of_file" size="1">' . "\n"
+           . '                <option value="' . $temp_charset . '"';
+        if ($temp_charset == $charset) {
+            echo ' selected="selected"';
+        }
+        echo '>' . $temp_charset . '</option>' . "\n";
+        while ($temp_charset = next($cfg['AvailableCharsets'])) {
+            echo '                <option value="' . $temp_charset . '"';
+            if ($temp_charset == $charset) {
+                echo ' selected="selected"';
+            }
+            echo '>' . $temp_charset . '</option>' . "\n";
+        }
+    echo '            </select>';
+    }
+?>
             </div>
     <?php
 } // end if