diff -rupN phpMyAdmin-2.11.9.6-all-languages/browse_foreigners.php phpMyAdmin-2.11.10.1-all-languages/browse_foreigners.php
--- phpMyAdmin-2.11.9.6-all-languages/browse_foreigners.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/browse_foreigners.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * display selection for relational field values
  *
- * @version $Id: browse_foreigners.php 11035 2008-01-05 13:33:05Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/calendar.php phpMyAdmin-2.11.10.1-all-languages/calendar.php
--- phpMyAdmin-2.11.9.6-all-languages/calendar.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/calendar.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: calendar.php 10474 2007-07-08 17:39:06Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/ChangeLog phpMyAdmin-2.11.10.1-all-languages/ChangeLog
--- phpMyAdmin-2.11.9.6-all-languages/ChangeLog	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/ChangeLog	2010-08-20 13:47:14.000000000 +0700
@@ -2,9 +2,21 @@
 phpMyAdmin - ChangeLog
 ----------------------
 
-$Id: ChangeLog 13034 2009-10-12 21:47:40Z lem9 $
+$Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
 
+2.11.10.1 (2010-08-20)
+- [setup] Fixed output sanitizing in setup script, see PMASA-2010-4 for
+  more details.
+- [core] Fixed various XSS issues, see PMASA-2010-5 for more details.
+
+2.11.10.0 (2009-12-07)
+- [core] safer handling of temporary files with open_basedir (thanks to Thijs
+  Kinkhorst)
+- [core] do not automatically set and create TempDir, it might lead to security
+  issue (thanks to Thijs Kinkhorst)
+- [setup] avoid usage of (un)serialize, what might be unsafe in some cases
+
 2.11.9.6 (2009-10-12)
 - [security] XSS and SQL injection, thanks to Herman van Rink
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/changelog.php phpMyAdmin-2.11.10.1-all-languages/changelog.php
--- phpMyAdmin-2.11.9.6-all-languages/changelog.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/changelog.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Simple script to set correct charset for changelog
  *
- * @version $Id: changelog.php 10561 2007-08-17 20:52:07Z lem9 $
+ * @version $Id$
  */
 
 $changelog = htmlspecialchars(file_get_contents('ChangeLog'));
diff -rupN phpMyAdmin-2.11.9.6-all-languages/chk_rel.php phpMyAdmin-2.11.10.1-all-languages/chk_rel.php
--- phpMyAdmin-2.11.9.6-all-languages/chk_rel.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/chk_rel.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: chk_rel.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/config.sample.inc.php phpMyAdmin-2.11.10.1-all-languages/config.sample.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/config.sample.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/config.sample.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -7,7 +7,7 @@
  * All directives are explained in Documentation.html and on phpMyAdmin
  * wiki <http://wiki.phpmyadmin.net>.
  *
- * @version $Id: config.sample.inc.php 12304 2009-03-24 12:56:58Z nijel $
+ * @version $Id$
  */
 
 /*
diff -rupN phpMyAdmin-2.11.9.6-all-languages/contrib/README phpMyAdmin-2.11.10.1-all-languages/contrib/README
--- phpMyAdmin-2.11.9.6-all-languages/contrib/README	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/contrib/README	2010-08-20 13:47:14.000000000 +0700
@@ -1,4 +1,4 @@
-$Id: README 8657 2006-02-22 15:35:00Z nijel $
+$Id$
 
 This directory contains various stuff contributed by users that might be
 useful to other. There is no guarantee it will work for you.
diff -rupN phpMyAdmin-2.11.9.6-all-languages/CREDITS phpMyAdmin-2.11.10.1-all-languages/CREDITS
--- phpMyAdmin-2.11.9.6-all-languages/CREDITS	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/CREDITS	2010-08-20 13:47:14.000000000 +0700
@@ -1,4 +1,4 @@
-$Id: CREDITS 5152 2003-11-18 15:20:45Z nijel $
+$Id$
 
 
 phpMyAdmin - Credits
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_create.php phpMyAdmin-2.11.10.1-all-languages/db_create.php
--- phpMyAdmin-2.11.9.6-all-languages/db_create.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_create.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_create.php 11402 2008-07-15 18:42:50Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_datadict.php phpMyAdmin-2.11.10.1-all-languages/db_datadict.php
--- phpMyAdmin-2.11.9.6-all-languages/db_datadict.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_datadict.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_datadict.php 11334 2008-06-21 13:16:05Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_export.php phpMyAdmin-2.11.10.1-all-languages/db_export.php
--- phpMyAdmin-2.11.9.6-all-languages/db_export.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_export.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * dumps a database
  *
- * @version $Id: db_export.php 10541 2007-08-01 16:44:32Z lem9 $
+ * @version $Id$
  * @uses    libraries/db_common.inc.php
  * @uses    libraries/db_info.inc.php
  * @uses    libraries/display_export.lib.php
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_import.php phpMyAdmin-2.11.10.1-all-languages/db_import.php
--- phpMyAdmin-2.11.9.6-all-languages/db_import.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_import.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_operations.php phpMyAdmin-2.11.10.1-all-languages/db_operations.php
--- phpMyAdmin-2.11.9.6-all-languages/db_operations.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_operations.php	2010-08-20 13:47:14.000000000 +0700
@@ -9,7 +9,7 @@
  *  - adding tables
  *  - viewing PDF schemas
  *
- * @version $Id: db_operations.php 13034 2009-10-12 21:47:40Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_printview.php phpMyAdmin-2.11.10.1-all-languages/db_printview.php
--- phpMyAdmin-2.11.9.6-all-languages/db_printview.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_printview.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_printview.php 11334 2008-06-21 13:16:05Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_qbe.php phpMyAdmin-2.11.10.1-all-languages/db_qbe.php
--- phpMyAdmin-2.11.9.6-all-languages/db_qbe.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_qbe.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * query by example the whole database
  *
- * @version $Id: db_qbe.php 10588 2007-09-02 19:23:59Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_search.php phpMyAdmin-2.11.10.1-all-languages/db_search.php
--- phpMyAdmin-2.11.9.6-all-languages/db_search.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_search.php	2010-08-20 13:47:14.000000000 +0700
@@ -45,7 +45,7 @@
  * @uses    array_intersect()
  * @uses    sprintf()
  * @uses    in_array()
- * @version $Id: db_search.php 10958 2007-12-04 18:07:16Z lem9 $
+ * @version $Id$
  * @author  Thomas Chaumeny <chaume92 at aol.com>
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_sql.php phpMyAdmin-2.11.10.1-all-languages/db_sql.php
--- phpMyAdmin-2.11.9.6-all-languages/db_sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_sql.php 10965 2007-12-05 17:53:52Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -36,7 +36,7 @@ if ($num_tables == 0 && empty($db_query_
 /**
  * Query box, bookmark, insert data from textfile
  */
-PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';');
+PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';');
 
 /**
  * Displays the footer
diff -rupN phpMyAdmin-2.11.9.6-all-languages/db_structure.php phpMyAdmin-2.11.10.1-all-languages/db_structure.php
--- phpMyAdmin-2.11.9.6-all-languages/db_structure.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/db_structure.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_structure.php 11244 2008-05-08 01:30:22Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/docs.css phpMyAdmin-2.11.10.1-all-languages/docs.css
--- phpMyAdmin-2.11.9.6-all-languages/docs.css	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/docs.css	2010-08-20 13:47:14.000000000 +0700
@@ -1,4 +1,4 @@
-/* $Id: docs.css 9263 2006-08-09 17:35:20Z lem9 $ */
+/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/Documentation.html phpMyAdmin-2.11.10.1-all-languages/Documentation.html
--- phpMyAdmin-2.11.9.6-all-languages/Documentation.html	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/Documentation.html	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-<!-- $Id: Documentation.html 13041 2009-10-12 22:27:06Z lem9 $ -->
+<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.9.6 - Documentation</title>
+    <title>phpMyAdmin 2.11.10.1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -33,7 +33,7 @@
     <li><a href="#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.9.6 Documentation</h1>
+<h1>phpMyAdmin 2.11.10.1 Documentation</h1>
 
 <ul><li><a href="http://www.phpmyadmin.net/">
             phpMyAdmin homepage</a></li>
@@ -48,7 +48,7 @@
         </ul>
     </li>
     <li>Documentation version:
-        <i>$Id: Documentation.html 13041 2009-10-12 22:27:06Z lem9 $</i>
+        <i>$Id$</i>
     </li>
 </ul>
 
@@ -1744,12 +1744,51 @@ $cfg['TrustedProxies'] =
 
     <dt id="cfg_TempDir">$cfg['TempDir'] string</dt>
     <dd>
-        The name of the directory where temporary files can be stored.
+        The name of the directory where temporary files can be stored. 
         <br /><br />
+
         This is needed for native MS Excel export, see
         <a href="#faq6_23"><abbr title="Frequently Asked Questions">FAQ</abbr>
-        6.23</a>
-    </dd>
+		6.23</a> and to work around limitations of 
+	<tt>open_basedir</tt> for uploaded
+        files, see <a href="#faq1_11"><abbr title="Frequently Asked Questions">FAQ</abbr>
+        1.11</a>.
+        <br /><br />
+
+	If the directory where phpMyAdmin is installed is subject to an
+	<tt>open_basedir</tt> restriction, you need to create a
+        temporary directory in some directory accessible by the web
+        server. However for security reasons, this directory should be outside
+        the tree published by webserver. If you cannot avoid having this
+        directory published by webserver, place at least an empty
+        <tt>index.html</tt> file there, so that directory listing is not
+        possible.
+        <br /><br />
+
+        This directory should have as strict permissions as possible as the only
+        user required to access this directory is the one who runs the
+        webserver. If you have root privileges, simply make this user owner of
+        this directory and make it accessible only by it:
+        <br /><br />
+
+<pre>
+chown www-data:www-data tmp
+chmod 700 tmp
+</pre>
+
+        If you cannot change owner of the directory, you can achieve a similar
+        setup using <abbr title="Access Control List">ACL</abbr>:
+
+<pre>
+chmod 700 tmp
+setfacl -m "g:www-data:rwx" tmp
+setfacl -d -m "g:www-data:rwx" tmp
+</pre>
+
+        If neither of above works for you, you can still make the directory
+        <code>chmod 777</code>, but it might impose risk of other users on
+        system reading and writing data in this directory.
+	</dd>
 
     <dt id="cfg_Export">$cfg['Export'] array</dt>
     <dd>
@@ -2448,11 +2487,9 @@ $cfg['TrustedProxies'] =
     uploading a file from the query box.</a></h4>
 
 <p> Since version 2.2.4, phpMyAdmin supports servers with open_basedir
-    restrictions. Assuming that the restriction allows you to open files in the
-    current directory ('.'), all you have to do is create a 'tmp' directory
-    under the phpMyAdmin install directory, with permissions 777 and the same
-    owner as the owner of your phpMyAdmin directory. The  uploaded files will
-    be moved there, and after execution of your
+    restrictions. However you need to create temporary directory and 
+    configure it as <a href="#cfg_TempDir" class="configrule">$cfg['TempDir']</a>.
+    The uploaded files will be moved there, and after execution of your
     <abbr title="structured query language">SQL</abbr> commands, removed.</p>
 
 <h4 id="faq1_12">
diff -rupN phpMyAdmin-2.11.9.6-all-languages/Documentation.txt phpMyAdmin-2.11.10.1-all-languages/Documentation.txt
--- phpMyAdmin-2.11.9.6-all-languages/Documentation.txt	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/Documentation.txt	2010-08-20 13:47:14.000000000 +0700
@@ -11,7 +11,7 @@
   * Translators
   * Glossary
 
-phpMyAdmin 2.11.9.6 Documentation
+phpMyAdmin 2.11.10.1 Documentation
 
   * phpMyAdmin homepage
   * SourceForge phpMyAdmin project page
@@ -20,8 +20,7 @@ phpMyAdmin 2.11.9.6 Documentation
       + Version history: ChangeLog
       + General notes: README
       + License: LICENSE
-  * Documentation version: $Id: Documentation.html 13041 2009-10-12 22:27:06Z
-    lem9 $
+  * Documentation version: $Id$
 
 Requirements
 
@@ -1234,7 +1233,35 @@ $cfg['SaveDir'] string
 $cfg['TempDir'] string
     The name of the directory where temporary files can be stored.
 
-    This is needed for native MS Excel export, see FAQ 6.23
+    This is needed for native MS Excel export, see FAQ 6.23 and to work around
+    limitations of open_basedir for uploaded files, see FAQ 1.11.
+
+    If the directory where phpMyAdmin is installed is subject to an
+    open_basedir restriction, you need to create a temporary directory in some
+    directory accessible by the web server. However for security reasons, this
+    directory should be outside the tree published by webserver. If you cannot
+    avoid having this directory published by webserver, place at least an empty
+    index.html file there, so that directory listing is not possible.
+
+    This directory should have as strict permissions as possible as the only
+    user required to access this directory is the one who runs the webserver.
+    If you have root privileges, simply make this user owner of this directory
+    and make it accessible only by it:
+
+
+    chown www-data:www-data tmp
+    chmod 700 tmp
+
+    If you cannot change owner of the directory, you can achieve a similar
+    setup using ACL:
+
+    chmod 700 tmp
+    setfacl -m "g:www-data:rwx" tmp
+    setfacl -d -m "g:www-data:rwx" tmp
+
+    If neither of above works for you, you can still make the directory chmod
+    777, but it might impose risk of other users on system reading and writing
+    data in this directory.
 $cfg['Export'] array
     In this array are defined default parameters for export, names of items are
     similar to texts seen on export page, so you can easily identify what they
@@ -1794,11 +1821,9 @@ It seems to clear up many problems betwe
 box.
 
 Since version 2.2.4, phpMyAdmin supports servers with open_basedir
-restrictions. Assuming that the restriction allows you to open files in the
-current directory ('.'), all you have to do is create a 'tmp' directory under
-the phpMyAdmin install directory, with permissions 777 and the same owner as
-the owner of your phpMyAdmin directory. The uploaded files will be moved there,
-and after execution of your SQL commands, removed.
+restrictions. However you need to create temporary directory and configure it
+as $cfg['TempDir']. The uploaded files will be moved there, and after execution
+of your SQL commands, removed.
 
 1.12 I have lost my MySQL root password, what can I do?
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/error.php phpMyAdmin-2.11.10.1-all-languages/error.php
--- phpMyAdmin-2.11.9.6-all-languages/error.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/error.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * phpMyAdmin fatal error display page
  *
- * @version $Id: error.php 10289 2007-04-16 13:32:45Z cybot_tm $
+ * @version $Id$
  */
 
 /* Input sanitizing */
@@ -73,10 +73,14 @@ header('Content-Type: text/html; charset
 <body>
 <h1>phpMyAdmin - <?php echo $type; ?></h1>
 <p><?php
-if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
-    echo PMA_sanitize(stripslashes($_REQUEST['error']));
+if (!empty($_REQUEST['error'])) {
+    if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
+        echo PMA_sanitize(stripslashes($_REQUEST['error']));
+    } else {
+        echo PMA_sanitize($_REQUEST['error']);
+    }
 } else {
-    echo PMA_sanitize($_REQUEST['error']);
+    echo 'No error message!';
 }
 ?></p>
 </body>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/export.php phpMyAdmin-2.11.10.1-all-languages/export.php
--- phpMyAdmin-2.11.9.6-all-languages/export.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/export.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @todo    too much die here, or?
- * @version $Id: export.php 11450 2008-08-01 19:15:01Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/import.php phpMyAdmin-2.11.10.1-all-languages/import.php
--- phpMyAdmin-2.11.9.6-all-languages/import.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/import.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Core script for import, this is just the glue around all other stuff
  *
- * @version $Id: import.php 10398 2007-05-15 11:16:10Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/index.php phpMyAdmin-2.11.10.1-all-languages/index.php
--- phpMyAdmin-2.11.9.6-all-languages/index.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/index.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * forms frameset
  *
- * @version $Id: index.php 11402 2008-07-15 18:42:50Z lem9 $
+ * @version $Id$
  * @uses    $GLOBALS['strNoFrames']
  * @uses    $GLOBALS['cfg']['QueryHistoryDB']
  * @uses    $GLOBALS['cfg']['Server']['user']
diff -rupN phpMyAdmin-2.11.9.6-all-languages/INSTALL phpMyAdmin-2.11.10.1-all-languages/INSTALL
--- phpMyAdmin-2.11.9.6-all-languages/INSTALL	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/INSTALL	2010-08-20 13:47:14.000000000 +0700
@@ -1,4 +1,4 @@
-$Id: INSTALL 9537 2006-10-12 16:27:13Z nijel $
+$Id$
 
 phpMyAdmin - Installation
 -------------------------
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/functions.js phpMyAdmin-2.11.10.1-all-languages/js/functions.js
--- phpMyAdmin-2.11.9.6-all-languages/js/functions.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/functions.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * general function, usally for data manipulation pages
  *
- * @version $Id: functions.js 10964 2007-12-05 17:01:48Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/indexes.js phpMyAdmin-2.11.10.1-all-languages/js/indexes.js
--- phpMyAdmin-2.11.9.6-all-languages/js/indexes.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/indexes.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * function used for index manipulation pages
  *
- * @version $Id: indexes.js 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/querywindow.js phpMyAdmin-2.11.10.1-all-languages/js/querywindow.js
--- phpMyAdmin-2.11.9.6-all-languages/js/querywindow.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/querywindow.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * functions used by and for querywindow
  *
- * @version $Id: querywindow.js 11402 2008-07-15 18:42:50Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/server_privileges.js phpMyAdmin-2.11.10.1-all-languages/js/server_privileges.js
--- phpMyAdmin-2.11.9.6-all-languages/js/server_privileges.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/server_privileges.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * function used in server privilege pages
  *
- * @version $Id: server_privileges.js 10929 2007-11-15 17:51:46Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/tbl_change.js phpMyAdmin-2.11.10.1-all-languages/js/tbl_change.js
--- phpMyAdmin-2.11.9.6-all-languages/js/tbl_change.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/tbl_change.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * function used in table data manipulation pages
  *
- * @version $Id: tbl_change.js 10474 2007-07-08 17:39:06Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/tooltip.js phpMyAdmin-2.11.10.1-all-languages/js/tooltip.js
--- phpMyAdmin-2.11.9.6-all-languages/js/tooltip.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/tooltip.js	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
  * Displays the Tooltips (hints), if we have some
  * 2005-01-20 added by Michael Keck (mkkeck)
  *
- * @version $Id: tooltip.js 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/js/user_password.js phpMyAdmin-2.11.10.1-all-languages/js/user_password.js
--- phpMyAdmin-2.11.9.6-all-languages/js/user_password.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/js/user_password.js	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /**
  * function used for password change form
  *
- * @version $Id: user_password.js 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/add_message_file.sh phpMyAdmin-2.11.10.1-all-languages/lang/add_message_file.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/add_message_file.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/add_message_file.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: add_message_file.sh 7364 2005-09-24 08:49:52Z nijel $
+# $Id$
 #
 # Shell script that adds a message file to all message files
 # adding "//to translate" on each line
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/add_message.sh phpMyAdmin-2.11.10.1-all-languages/lang/add_message.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/add_message.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/add_message.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: add_message.sh 9537 2006-10-12 16:27:13Z nijel $
+# $Id$
 #
 # Shell script that adds a message to all message files (Lem9)
 #
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/afrikaans-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/afrikaans-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/afrikaans-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/afrikaans-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: afrikaans-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
      translated by Andreas Pauley <pauley@buitegroep.org.za>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/afrikaans-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/afrikaans-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/afrikaans-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/afrikaans-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: afrikaans-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
      translated by Andreas Pauley <pauley@buitegroep.org.za>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/albanian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/albanian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/albanian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/albanian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: albanian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by: Laurent Dhima <laurenti at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/albanian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/albanian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/albanian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/albanian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: albanian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by: Laurent Dhima <laurenti at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/arabic-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/arabic-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/arabic-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/arabic-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: arabic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Original translation to Arabic by Fisal <fisal77 at hotmail.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/arabic-windows-1256.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/arabic-windows-1256.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/arabic-windows-1256.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/arabic-windows-1256.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: arabic-windows-1256.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Original translation to Arabic by Fisal <fisal77 at hotmail.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/azerbaijani-iso-8859-9.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/azerbaijani-iso-8859-9.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/azerbaijani-iso-8859-9.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/azerbaijani-iso-8859-9.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: azerbaijani-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // terc�medeki eksiklerimi ve ya sehv oldu�unu d���nd�y�n�z yerleri shehriyari@trcomm.net adresine g�ndere bilersiniz...
 // �ehriyar �manov 30 Avqust 2003... Shehi
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/azerbaijani-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/azerbaijani-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/azerbaijani-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/azerbaijani-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: azerbaijani-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // tercümedeki eksiklerimi ve ya sehv olduğunu düşündüyünüz yerleri shehriyari@trcomm.net adresine göndere bilersiniz...
 // Şehriyar İmanov 30 Avqust 2003... Shehi
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/basque-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/basque-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/basque-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/basque-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: basque-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/basque-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/basque-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/basque-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/basque-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: basque-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_cyrillic-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_cyrillic-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_cyrillic-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_cyrillic-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: belarusian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *     Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_cyrillic-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_cyrillic-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_cyrillic-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_cyrillic-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: belarusian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *     Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_latin-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_latin-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/belarusian_latin-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/belarusian_latin-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: belarusian_latin-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
 * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/bosnian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/bosnian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/bosnian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/bosnian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: bosnian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *     Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/bosnian-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/bosnian-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/bosnian-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/bosnian-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: bosnian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *     Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/brazilian_portuguese-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/brazilian_portuguese-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/brazilian_portuguese-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/brazilian_portuguese-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: brazilian_portuguese-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 /* translated by: Airon Luis Pereira <airon(dot)pereira(at)gmail(dot)com> */ 
 
 $charset = 'iso-8859-1'; 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/brazilian_portuguese-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/brazilian_portuguese-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/brazilian_portuguese-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/brazilian_portuguese-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: brazilian_portuguese-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 /* translated by: Airon Luis Pereira <airon(dot)pereira(at)gmail(dot)com> */ 
 
 $charset = 'utf-8'; 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-koi8-r.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-koi8-r.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-koi8-r.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-koi8-r.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: bulgarian-koi8-r.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Stanislav Yordanov <stanprog at stanprog.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: bulgarian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Stanislav Yordanov <stanprog at stanprog.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/bulgarian-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/bulgarian-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: bulgarian-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Stanislav Yordanov <stanprog at stanprog.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/catalan-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/catalan-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/catalan-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/catalan-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: catalan-iso-8859-1.inc.php 11159 2008-03-07 17:59:01Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr'; // ('ltr' d'esquerra a dreta, 'rtl' de dreta a esquerra)
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/catalan-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/catalan-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/catalan-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/catalan-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: catalan-utf-8.inc.php 11159 2008-03-07 17:59:01Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/check_lang.sh phpMyAdmin-2.11.10.1-all-languages/lang/check_lang.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/check_lang.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/check_lang.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: check_lang.sh 9393 2006-09-08 11:28:23Z lem9 $
+# $Id$
 ##
 # Shell script to check that all language files are syncronized
 # Catches duplicate/missing strings
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/chinese_simplified-gb2312.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/chinese_simplified-gb2312.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/chinese_simplified-gb2312.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/chinese_simplified-gb2312.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: chinese_simplified-gb2312.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Last translation by: Funda Wang <fundawang@en2china.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/chinese_simplified-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/chinese_simplified-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/chinese_simplified-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/chinese_simplified-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: chinese_simplified-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Last translation by: Funda Wang <fundawang@en2china.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/chinese_traditional-big5.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/chinese_traditional-big5.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/chinese_traditional-big5.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/chinese_traditional-big5.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: chinese_traditional-big5.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Last translation by: Siu Sun <siusun@best-view.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/chinese_traditional-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/chinese_traditional-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/chinese_traditional-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/chinese_traditional-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: chinese_traditional-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Last translation by: Siu Sun <siusun@best-view.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/croatian-iso-8859-2.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/croatian-iso-8859-2.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/croatian-iso-8859-2.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/croatian-iso-8859-2.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: croatian-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *   Croatian language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/croatian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/croatian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/croatian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/croatian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: croatian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *   Croatian language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/croatian-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/croatian-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/croatian-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/croatian-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: croatian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  *   Croatian language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/czech-iso-8859-2.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/czech-iso-8859-2.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/czech-iso-8859-2.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/czech-iso-8859-2.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: czech-iso-8859-2.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
+/* $Id$ */
 
 /**
  * Czech language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/czech-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/czech-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/czech-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/czech-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: czech-utf-8.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
+/* $Id$ */
 
 /**
  * Czech language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/czech-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/czech-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/czech-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/czech-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: czech-windows-1250.inc.php 11119 2008-02-12 01:15:49Z nijel $ */
+/* $Id$ */
 
 /**
  * Czech language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/danish-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/danish-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/danish-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/danish-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: danish-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - overs�tter AlleyKat kan kontaktes p� < phpmyadmin (at) phpbb2.dk > */
+/* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - overs�tter AlleyKat kan kontaktes p� < phpmyadmin (at) phpbb2.dk > */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/danish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/danish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/danish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/danish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: danish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
+/* $Id$ */ /* danish - Dansk v 2.20 (based on english rev. 10226) 2007/04/03 01:23:45 - oversætter AlleyKat kan kontaktes på < phpmyadmin (at) phpbb2.dk > */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/dutch-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/dutch-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/dutch-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/dutch-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: dutch-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Updated by "CaliMonk" <calimonk at gmx.net> on 2005/01/04.
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/dutch-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/dutch-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/dutch-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/dutch-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: dutch-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Updated by "CaliMonk" <calimonk at gmx.net> on 2005/01/04.
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/dutch-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/dutch-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/dutch-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/dutch-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: dutch-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Updated by "CaliMonk" <calimonk at gmx.net> on 2005/01/04.
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/english-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/english-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/english-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/english-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: english-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-15';
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/english-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/english-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/english-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/english-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: english-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/english-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/english-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/english-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/english-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: english-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/estonian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/estonian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/estonian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/estonian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: estonian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Marko Ellermaa, <marko.ellermaa@nlkp.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/estonian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/estonian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/estonian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/estonian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: estonian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Marko Ellermaa, <marko.ellermaa@nlkp.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/finnish-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/finnish-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/finnish-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/finnish-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: finnish-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Jouni K�hk�nen, <address withdrawn>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/finnish-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/finnish-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/finnish-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/finnish-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: finnish-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Jouni K�hk�nen, <address withdrawn>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/finnish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/finnish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/finnish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/finnish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: finnish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Jouni Kähkönen, <address withdrawn>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/french-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/french-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/french-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/french-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: french-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-15';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/french-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/french-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/french-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/french-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: french-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/french-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/french-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/french-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/french-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: french-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/galician-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/galician-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/galician-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/galician-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: galician-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Xos� Calvo <xosecalvo at terra.es>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/galician-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/galician-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/galician-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/galician-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: galician-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Xosé Calvo <xosecalvo at terra.es>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/georgian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/georgian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/georgian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/georgian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: georgian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translation by Kakha Mchedlidze <kakha at qartuli.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/german-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/german-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/german-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/german-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -8,7 +8,7 @@
  * Bei Verbesserungsvorschl�gen diese Datei betreffend wenden Sie sich bitte an
  *     https://sourceforge.net/tracker/?group_id=23067&atid=387645
  *
- * $Id: german-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $
+ * $Id$
  */
 
 $charset = 'iso-8859-15';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/german-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/german-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/german-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/german-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -8,7 +8,7 @@
  * Bei Verbesserungsvorschl�gen diese Datei betreffend wenden Sie sich bitte an
  *     https://sourceforge.net/tracker/?group_id=23067&atid=387645
  *
- * $Id: german-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $
+ * $Id$
  */
 
 $charset = 'iso-8859-1';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/german-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/german-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/german-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/german-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -8,7 +8,7 @@
  * Bei Verbesserungsvorschlägen diese Datei betreffend wenden Sie sich bitte an
  *     https://sourceforge.net/tracker/?group_id=23067&atid=387645
  *
- * $Id: german-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $
+ * $Id$
  */
 
 $charset = 'utf-8';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/greek-iso-8859-7.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/greek-iso-8859-7.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/greek-iso-8859-7.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/greek-iso-8859-7.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: greek-iso-8859-7.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* Translated by Kyriakos Xagoraris <theremon at users.sourceforge.net> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/greek-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/greek-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/greek-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/greek-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: greek-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* Translated by Kyriakos Xagoraris <theremon at users.sourceforge.net> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/hebrew-iso-8859-8-i.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/hebrew-iso-8859-8-i.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/hebrew-iso-8859-8-i.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/hebrew-iso-8859-8-i.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: hebrew-iso-8859-8-i.inc.php 11113 2008-02-09 16:09:54Z lem9 $ 
+/* $Id$ 
  * Translated by Hadar Porat <hadar at banner.co.il> */
 
 $charset = 'iso-8859-8-i';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/hebrew-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/hebrew-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/hebrew-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/hebrew-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: hebrew-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ 
+/* $Id$ 
  * Translated by Hadar Porat <hadar at banner.co.il> */
 
 $charset = 'utf-8';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/hindi-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/hindi-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/hindi-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/hindi-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: hindi-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // Hindi translation
 // 1st release   :   by Girish Nair <girishn@nagpur.dot.net.in(outdated)> : 08-Aug-2002
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/indonesian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/indonesian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/indonesian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/indonesian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: indonesian-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/indonesian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/indonesian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/indonesian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/indonesian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: indonesian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/italian-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/italian-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/italian-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/italian-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: italian-iso-8859-15.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
+/* $Id$ */
 
 /**
  * translated by: Pietro Danesi <danone at users.sourceforge.net>  2002-03-29
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/italian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/italian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/italian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/italian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: italian-iso-8859-1.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
+/* $Id$ */
 
 /**
  * translated by: Pietro Danesi <danone at users.sourceforge.net>  2002-03-29
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/italian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/italian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/italian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/italian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: italian-utf-8.inc.php 11121 2008-02-12 18:05:59Z lem9 $ */
+/* $Id$ */
 
 /**
  * translated by: Pietro Danesi <danone at users.sourceforge.net>  2002-03-29
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/japanese-euc.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/japanese-euc.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/japanese-euc.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/japanese-euc.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: japanese-euc.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Yukihiro Kawada <kawada at den.fujifilm.co.jp>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/japanese-sjis.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/japanese-sjis.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/japanese-sjis.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/japanese-sjis.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: japanese-sjis.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Yukihiro Kawada <kawada at den.fujifilm.co.jp>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/japanese-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/japanese-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/japanese-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/japanese-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: japanese-utf-8.inc.php 11187 2008-04-06 00:00:42Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Yukihiro Kawada <kawada at den.fujifilm.co.jp>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/korean-euc-kr.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/korean-euc-kr.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/korean-euc-kr.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/korean-euc-kr.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: korean-euc-kr.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* Translated by WooSuhan <kjh@unews.NOSPAM.co.kr> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/korean-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/korean-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/korean-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/korean-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: korean-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* Translated by WooSuhan <kjh@unews.NOSPAM.co.kr> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/latvian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/latvian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/latvian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/latvian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: latvian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Latvian language file by Sandis Jērics <sandisj at parks.lv>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/latvian-windows-1257.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/latvian-windows-1257.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/latvian-windows-1257.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/latvian-windows-1257.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: latvian-windows-1257.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Latvian language file by Sandis J�rics <sandisj at parks.lv>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/lithuanian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/lithuanian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/lithuanian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/lithuanian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: lithuanian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/lithuanian-windows-1257.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/lithuanian-windows-1257.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/lithuanian-windows-1257.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/lithuanian-windows-1257.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: lithuanian-windows-1257.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'windows-1257';
 $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left)
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/macedonian_cyrillic-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/macedonian_cyrillic-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/macedonian_cyrillic-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/macedonian_cyrillic-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: macedonian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/macedonian_cyrillic-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/macedonian_cyrillic-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/macedonian_cyrillic-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/macedonian_cyrillic-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: macedonian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/malay-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/malay-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/malay-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/malay-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: malay-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
 Projek Penterjemahan (l10n) phpmyadmin.net boleh diakses di laman http://shapik.johordt.com/l10n
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/malay-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/malay-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/malay-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/malay-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: malay-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /*
 Projek Penterjemahan (l10n) phpmyadmin.net boleh diakses di laman http://shapik.johordt.com/l10n
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/mongolian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/mongolian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/mongolian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/mongolian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: mongolian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Bayarsaikhan Enkhtaivan
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/norwegian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/norwegian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/norwegian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/norwegian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: norwegian-iso-8859-1.inc.php 11434 2008-07-25 20:41:14Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Sven-Erik Andersen <sven DOT erik DOT andersen AT gmail DOT com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/norwegian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/norwegian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/norwegian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/norwegian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: norwegian-utf-8.inc.php 11508 2008-08-26 16:33:00Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Sven-Erik Andersen <sven DOT erik DOT andersen AT gmail DOT com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/persian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/persian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/persian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/persian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 <?php
 
-/* $Id: persian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 /*
 Persian(Farsi) translation by : Bornis Group
 www.BornisGroup.com
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/persian-windows-1256.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/persian-windows-1256.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/persian-windows-1256.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/persian-windows-1256.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 <?php
 
-/* $Id: persian-windows-1256.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 /*
 Persian(Farsi) translation by : Bornis Group
 www.BornisGroup.com
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/polish-iso-8859-2.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/polish-iso-8859-2.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/polish-iso-8859-2.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/polish-iso-8859-2.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: polish-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-2';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/polish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/polish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/polish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/polish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: polish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/polish-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/polish-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/polish-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/polish-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: polish-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'windows-1250';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: portuguese-iso-8859-15.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Portuguese language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: portuguese-iso-8859-1.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Portuguese language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/portuguese-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/portuguese-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: portuguese-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Portuguese language file by
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/remove_message.sh phpMyAdmin-2.11.10.1-all-languages/lang/remove_message.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/remove_message.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/remove_message.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: remove_message.sh 5152 2003-11-18 15:20:45Z nijel $
+# $Id$
 #
 # Shell script that removes a message from all message files (Lem9)
 # it checks for the message, followed by a space
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/romanian-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/romanian-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/romanian-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/romanian-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: romanian-iso-8859-1.inc.php 11213 2008-04-23 17:13:43Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/romanian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/romanian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/romanian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/romanian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: romanian-utf-8.inc.php 11213 2008-04-23 17:13:43Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/russian-cp-866.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/russian-cp-866.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/russian-cp-866.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/russian-cp-866.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: russian-cp-866.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Gosha Sakovich <gt2 at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/russian-koi8-r.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/russian-koi8-r.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/russian-koi8-r.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/russian-koi8-r.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: russian-koi8-r.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Gosha Sakovich <gt2 at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/russian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/russian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/russian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/russian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: russian-utf-8.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Gosha Sakovich <gt2 at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/russian-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/russian-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/russian-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/russian-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: russian-windows-1251.inc.php 11161 2008-03-09 14:12:30Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by Gosha Sakovich <gt2 at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/serbian_cyrillic-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/serbian_cyrillic-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/serbian_cyrillic-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/serbian_cyrillic-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: serbian_cyrillic-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/serbian_cyrillic-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/serbian_cyrillic-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/serbian_cyrillic-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/serbian_cyrillic-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: serbian_cyrillic-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/serbian_latin-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/serbian_latin-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/serbian_latin-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/serbian_latin-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: serbian_latin-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/serbian_latin-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/serbian_latin-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/serbian_latin-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/serbian_latin-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: serbian_latin-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /**
  * Translated by:
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/sinhala-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/sinhala-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/sinhala-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/sinhala-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: sinhala-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 // 
 // by malindahs
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovak-iso-8859-2.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovak-iso-8859-2.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovak-iso-8859-2.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovak-iso-8859-2.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovak-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: lubos klokner <erkac@vault-tec.sk> */
 /* and Ivan Kuriscak <shylauda69@yahoo.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovak-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovak-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovak-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovak-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovak-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: lubos klokner <erkac@vault-tec.sk> */
 /* and Ivan Kuriscak <shylauda69@yahoo.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovak-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovak-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovak-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovak-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovak-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: lubos klokner <erkac@vault-tec.sk> */
 /* and Ivan Kuriscak <shylauda69@yahoo.com>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-iso-8859-2.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-iso-8859-2.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-iso-8859-2.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-iso-8859-2.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovenian-iso-8859-2.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: urska.colner, agenda d.o.o. <urska.colner@agenda.si>, uros kositer, agenda d.o.o. <urosh@agenda.si> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovenian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: urska.colner, agenda d.o.o. <urska.colner@agenda.si>, uros kositer, agenda d.o.o. <urosh@agenda.si> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-windows-1250.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-windows-1250.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/slovenian-windows-1250.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/slovenian-windows-1250.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: slovenian-windows-1250.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 /* By: urska.colner, agenda d.o.o. <urska.colner@agenda.si>, uros kositer, agenda d.o.o. <urosh@agenda.si> */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/sort_lang.sh phpMyAdmin-2.11.10.1-all-languages/lang/sort_lang.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/sort_lang.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/sort_lang.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: sort_lang.sh 5206 2003-11-26 20:42:58Z nijel $
+# $Id$
 ##
 # Shell script to make each language file neat and tidy
 #
@@ -30,7 +30,7 @@ sortlang()
     TRANSLATIONSTRING='//.*translate.*$'
     STRINGSTRING='^\$str[[:alnum:]_]+'
     WHITESPACE='^[[:blank:]]*$'
-    CVSID='/\* \$Id: sort_lang.sh 5206 2003-11-26 20:42:58Z nijel $ \*/'
+    CVSID='/\* \$Id$ \*/'
 
     echo -n "Extracting:"
     echo -n " head"
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/spanish-iso-8859-15.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/spanish-iso-8859-15.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/spanish-iso-8859-15.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/spanish-iso-8859-15.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: spanish-iso-8859-15.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-15';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/spanish-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/spanish-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/spanish-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/spanish-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: spanish-iso-8859-1.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-1';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/spanish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/spanish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/spanish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/spanish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: spanish-utf-8.inc.php 11212 2008-04-23 16:28:20Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/swedish-iso-8859-1.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/swedish-iso-8859-1.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/swedish-iso-8859-1.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/swedish-iso-8859-1.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: swedish-iso-8859-1.inc.php 11124 2008-02-13 17:32:43Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Bj�rn T. Hallberg <bjornth at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/swedish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/swedish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/swedish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/swedish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: swedish-utf-8.inc.php 11186 2008-04-05 14:39:19Z lem9 $ */
+/* $Id$ */
 
 /*
  * Translated by Björn T. Hallberg <bjornth at users.sourceforge.net>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/sync_lang.sh phpMyAdmin-2.11.10.1-all-languages/lang/sync_lang.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/sync_lang.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/sync_lang.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: sync_lang.sh 11213 2008-04-23 17:13:43Z lem9 $
+# $Id$
 ##
 # Shell script that synchronises all translations in phpMyAdmin
 ##
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/tatarish-iso-8859-9.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/tatarish-iso-8859-9.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/tatarish-iso-8859-9.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/tatarish-iso-8859-9.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: tatarish-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'iso-8859-9';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/tatarish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/tatarish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/tatarish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/tatarish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: tatarish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/thai-tis-620.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/thai-tis-620.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/thai-tis-620.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/thai-tis-620.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: thai-tis-620.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // first created 2002/04/29 Arthit Suriyawongkul & Warit Wanasathian
 // last modified 2004/08/22 Arthit Suriyawongkul
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/thai-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/thai-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/thai-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/thai-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: thai-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // first created 2002/04/29 Arthit Suriyawongkul & Warit Wanasathian
 // last modified 2004/08/22 Arthit Suriyawongkul
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/translatecount.sh phpMyAdmin-2.11.10.1-all-languages/lang/translatecount.sh
--- phpMyAdmin-2.11.9.6-all-languages/lang/translatecount.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/translatecount.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: translatecount.sh 5152 2003-11-18 15:20:45Z nijel $
+# $Id$
 ##
 # Shell script to produce counts of just how out of date the translations are!
 ##
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/turkish-iso-8859-9.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/turkish-iso-8859-9.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/turkish-iso-8859-9.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/turkish-iso-8859-9.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: turkish-iso-8859-9.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // phpMyAdmin T�rk�e 01.09.2006 itibariyle �nceki �eviriye g�re �ok daha 
 // iyi bir �eviriyle yeniden yap�lm��t�r. 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/turkish-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/turkish-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/turkish-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/turkish-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: turkish-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 // phpMyAdmin Türkçe 01.09.2006 itibariyle önceki çeviriye göre çok daha 
 // iyi bir çeviriyle yeniden yapılmıştır. 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/ukrainian-utf-8.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/ukrainian-utf-8.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/ukrainian-utf-8.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/ukrainian-utf-8.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: ukrainian-utf-8.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'utf-8';
 $allow_recoding = TRUE;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/lang/ukrainian-windows-1251.inc.php phpMyAdmin-2.11.10.1-all-languages/lang/ukrainian-windows-1251.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/lang/ukrainian-windows-1251.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/lang/ukrainian-windows-1251.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: ukrainian-windows-1251.inc.php 11113 2008-02-09 16:09:54Z lem9 $ */
+/* $Id$ */
 
 $charset = 'windows-1251';
 $text_dir = 'ltr';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/auth/config.auth.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/auth/config.auth.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/auth/config.auth.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/auth/config.auth.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run config authentication (ie no authentication).
  *
- * @version $Id: config.auth.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/auth/cookie.auth.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/auth/cookie.auth.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/auth/cookie.auth.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/auth/cookie.auth.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -5,7 +5,7 @@
  * Thanks to Piotr Roszatycki <d3xter at users.sourceforge.net> and
  * Dan Wilson who built this patch for the Debian package.
  *
- * @version $Id: cookie.auth.lib.php 11449 2008-08-01 19:00:36Z lem9 $
+ * @version $Id$
  */
 
 if (! defined('PHPMYADMIN')) {
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/auth/http.auth.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/auth/http.auth.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/auth/http.auth.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/auth/http.auth.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * Set of functions used to run http authentication.
  * NOTE: Requires PHP loaded as a Apache module.
  *
- * @version $Id: http.auth.lib.php 11184 2008-04-03 12:42:33Z lem9 $
+ * @version $Id$
  */
 
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/auth/signon.auth.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/auth/signon.auth.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/auth/signon.auth.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/auth/signon.auth.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to run single signon authentication.
  *
- * @version $Id: signon.auth.lib.php 10424 2007-06-07 17:14:21Z lem9 $
+ * @version $Id$
  */
 
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/blowfish.php phpMyAdmin-2.11.10.1-all-languages/libraries/blowfish.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/blowfish.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/blowfish.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
  *
  * @author  Mike Cochrane <mike@graftonhall.co.nz>
- * @version $Id: blowfish.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  * @since   Horde 2.2
  * @package horde.cipher
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/bookmark.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/bookmark.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/bookmark.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/bookmark.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the bookmark feature
  *
- * @version $Id: bookmark.lib.php 11163 2008-03-16 11:28:18Z lem9 $
+ * @version $Id$
  */
 
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/charset_conversion.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/charset_conversion.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/charset_conversion.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/charset_conversion.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Charset conversion functions.
  *
- * @version $Id: charset_conversion.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/check_user_privileges.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/check_user_privileges.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/check_user_privileges.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/check_user_privileges.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -5,7 +5,7 @@
  * ($controllink and $userlink are links to MySQL defined in the "common.inc.php" library)
  * Note: if no controluser is defined, $controllink contains $userlink
  *
- * @version $Id: check_user_privileges.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/cleanup.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/cleanup.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/cleanup.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/cleanup.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Functions for cleanup of user input.
  *
- * @version $Id: cleanup.lib.php 10723 2007-10-05 09:46:30Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/common.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/common.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/common.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/common.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -22,7 +22,7 @@
  * - db connection
  * - authentication work
  *
- * @version $Id: common.inc.php 11431 2008-07-25 12:25:33Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/common.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/common.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/common.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/common.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Misc functions used all over the scripts.
  *
- * @version $Id: common.lib.php 11321 2008-06-13 16:26:21Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -473,7 +473,7 @@ function PMA_mysqlDie($error_message = '
         $formatted_sql = '';
     } else {
         if (strlen($the_query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-            $formatted_sql = substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
+            $formatted_sql = htmlspecialchars(substr($the_query, 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
         } else {
             $formatted_sql = PMA_formatSql(PMA_SQP_parse($the_query), $the_query);
         }
@@ -622,22 +622,23 @@ function PMA_convert_using($string, $mod
 function PMA_sendHeaderLocation($uri)
 {
     if (PMA_IS_IIS && strlen($uri) > 600) {
+        require_once './libraries/js_escape.lib.php';
 
         echo '<html><head><title>- - -</title>' . "\n";
         echo '<meta http-equiv="expires" content="0">' . "\n";
         echo '<meta http-equiv="Pragma" content="no-cache">' . "\n";
         echo '<meta http-equiv="Cache-Control" content="no-cache">' . "\n";
-        echo '<meta http-equiv="Refresh" content="0;url=' .$uri . '">' . "\n";
+        echo '<meta http-equiv="Refresh" content="0;url=' .  htmlspecialchars($uri) . '">' . "\n";
         echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
-        echo 'setTimeout("window.location = unescape(\'"' . $uri . '"\')", 2000);' . "\n";
+        echo 'setTimeout("window.location = unescape(\'"' . PMA_escapeJsString($uri) . '"\')", 2000);' . "\n";
         echo '//]]>' . "\n";
         echo '</script>' . "\n";
         echo '</head>' . "\n";
         echo '<body>' . "\n";
         echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
-        echo 'document.write(\'<p><a href="' . $uri . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
+        echo 'document.write(\'<p><a href="' . htmlspecialchars($uri) . '">' . $GLOBALS['strGo'] . '</a></p>\');' . "\n";
         echo '//]]>' . "\n";
         echo '</script></body></html>' . "\n";
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/Config.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/Config.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/Config.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/Config.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  *
  *
- * @version $Id: Config.class.php 13041 2009-10-12 22:27:06Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -85,7 +85,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '2.11.9.6');
+        $this->set('PMA_VERSION', '2.11.10.1');
         /**
          * @deprecated
          */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/config.default.php phpMyAdmin-2.11.10.1-all-languages/libraries/config.default.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/config.default.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/config.default.php	2010-08-20 13:47:14.000000000 +0700
@@ -16,7 +16,7 @@
  *
  * All directives are explained in Documentation.html
  *
- * @version $Id: config.default.php 11422 2008-07-24 17:12:32Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/core.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/core.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/core.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/core.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Core functions used all over the scripts.
  *
- * @version $Id: core.lib.php 10420 2007-06-03 23:30:40Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/database_interface.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/database_interface.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/database_interface.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/database_interface.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Common Option Constants For DBI Functions
  *
- * @version $Id: database_interface.lib.php 11585 2008-09-15 12:03:45Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -208,6 +208,10 @@ function PMA_usort_comparison_callback($
     } else {
         $sorter = 'strcasecmp';
     }
+    /* No sorting when key is not present */
+    if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
+        return 0;
+    }
     // produces f.e.:
     // return -1 * strnatcasecmp($a["SCHEMA_TABLES"], $b["SCHEMA_TABLES"])
     return ($GLOBALS['callback_sort_order'] == 'ASC' ? 1 : -1) * $sorter($a[$GLOBALS['callback_sort_by']], $b[$GLOBALS['callback_sort_by']]);
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/db_common.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/db_common.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/db_common.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/db_common.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_common.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/dbg/setup.php phpMyAdmin-2.11.10.1-all-languages/libraries/dbg/setup.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/dbg/setup.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/dbg/setup.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: setup.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/dbi/mysql.dbi.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/dbi/mysql.dbi.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/dbi/mysql.dbi.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/dbi/mysql.dbi.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Interface to the classic MySQL extension
  *
- * @version $Id: mysql.dbi.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -300,6 +300,8 @@ function PMA_DBI_getError($link = null)
         $error_message = PMA_DBI_convert_message($error_message);
     }
 
+    $error_message = htmlspecialchars($error_message);
+
     // Some errors messages cannot be obtained by mysql_error()
     if ($error_number == 2002) {
         $error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem'];
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/dbi/mysqli.dbi.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/dbi/mysqli.dbi.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/dbi/mysqli.dbi.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/dbi/mysqli.dbi.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Interface to the improved MySQL extension (MySQLi)
  *
- * @version $Id: mysqli.dbi.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -417,6 +417,8 @@ function PMA_DBI_getError($link = null)
         $error_message = PMA_DBI_convert_message($error_message);
     }
 
+    $error_message = htmlspecialchars($error_message);
+
     if ($error_number == 2002) {
         $error = '#' . ((string) $error_number) . ' - ' . $GLOBALS['strServerNotResponding'] . ' ' . $GLOBALS['strSocketProblem'];
     } elseif (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) {
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/db_info.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/db_info.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/db_info.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/db_info.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -32,7 +32,7 @@
  * @uses    strnatcasecmp()
  * @uses    count()
  * @uses    addslashes()
- * @version $Id: db_info.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/db_links.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/db_links.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/db_links.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/db_links.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/db_routines.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/db_routines.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/db_routines.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/db_routines.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: db_routines.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/db_table_exists.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/db_table_exists.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/db_table_exists.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/db_table_exists.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * Ensure the database and the table exist (else move to the "parent" script)
  * and display headers
  *
- * @version $Id: db_table_exists.lib.php 12102 2008-12-09 14:03:57Z nijel $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_change_password.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_change_password.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_change_password.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_change_password.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Displays form for password change 
  *
- * @version $Id: display_change_password.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_create_database.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_create_database.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_create_database.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_create_database.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Displays form for creating database (if user has privileges for that)
  *
- * @version $Id: display_create_database.lib.php 11402 2008-07-15 18:42:50Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_create_table.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_create_table.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_create_table.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_create_table.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Displays form for creating a table (if user has privileges for that)
  *
- * @version $Id: display_create_table.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_export.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_export.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_export.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_export.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: display_export.lib.php 12302 2009-03-24 08:55:07Z nijel $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_import.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_import.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_import.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_import.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: display_import.lib.php 11405 2008-07-17 14:02:26Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_select_lang.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_select_lang.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_select_lang.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_select_lang.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Code for displaying language selection
  *
- * @version $Id: display_select_lang.lib.php 11449 2008-08-01 19:00:36Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_tbl.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_tbl.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_tbl.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_tbl.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: display_tbl.lib.php 11307 2008-06-10 16:32:39Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/display_tbl_links.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/display_tbl_links.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/display_tbl_links.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/display_tbl_links.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -7,7 +7,7 @@
  * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox
  * - also changes made in js/functions.js
  *
- * @version $Id: display_tbl_links.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/bdb.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/bdb.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/bdb.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/bdb.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: bdb.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/berkeleydb.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/berkeleydb.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/berkeleydb.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/berkeleydb.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: berkeleydb.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/binlog.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/binlog.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/binlog.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/binlog.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: binlog.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/innobase.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/innobase.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/innobase.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/innobase.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: innobase.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/innodb.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/innodb.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/innodb.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/innodb.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: innodb.lib.php 10478 2007-07-09 19:41:38Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/memory.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/memory.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/memory.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/memory.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: memory.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/merge.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/merge.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/merge.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/merge.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: merge.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/mrg_myisam.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/mrg_myisam.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/mrg_myisam.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/mrg_myisam.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: mrg_myisam.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/myisam.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/myisam.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/myisam.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/myisam.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: myisam.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/engines/ndbcluster.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/engines/ndbcluster.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/engines/ndbcluster.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/engines/ndbcluster.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: ndbcluster.lib.php 10137 2007-03-19 17:55:39Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/csv.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/csv.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/csv.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/csv.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: csv.php 11357 2008-06-28 14:17:11Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/excel.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/excel.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/excel.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/excel.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables
  *
- * @version $Id: excel.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/htmlexcel.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/htmlexcel.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/htmlexcel.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/htmlexcel.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables
  *
- * @version $Id: htmlexcel.php 11484 2008-08-13 16:28:43Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/htmlword.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/htmlword.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/htmlword.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/htmlword.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables
  *
- * @version $Id: htmlword.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/latex.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/latex.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/latex.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/latex.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build dumps of tables
  *
- * @version $Id: latex.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/ods.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/ods.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/ods.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/ods.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables
  *
- * @version $Id: ods.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/odt.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/odt.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/odt.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/odt.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build CSV dumps of tables
  *
- * @version $Id: odt.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/pdf.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/pdf.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/pdf.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/pdf.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Produce a PDF report (export) from a query
  *
- * @version $Id: pdf.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/sql.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/sql.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build SQL dumps of tables
  *
- * @version $Id: sql.php 11471 2008-08-09 13:58:44Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/xls.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/xls.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/xls.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/xls.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build XLS dumps of tables
  *
- * @version $Id: xls.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/xml.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/xml.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/xml.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/xml.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build XML dumps of tables
  *
- * @version $Id: xml.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/export/yaml.php phpMyAdmin-2.11.10.1-all-languages/libraries/export/yaml.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/export/yaml.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/export/yaml.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used to build YAML dumps of tables
  *
- * @version $Id: yaml.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/File.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/File.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/File.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/File.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * file upload functions
  *
- * @version $Id: File.class.php 11205 2008-04-22 11:26:24Z nijel $
+ * @version $Id$
  */
 
 /**
@@ -488,7 +488,7 @@ class PMA_File
      */
     function isReadable()
     {
-        // surpress warnings from beeing displayed, but not from beeing logged
+        // suppress warnings from being displayed, but not from being logged
         // any file access outside of open_basedir will issue a warning
         ob_start();
         $is_readable = is_readable($this->getName());
@@ -527,42 +527,15 @@ class PMA_File
             return true;
         }
 
-        /**
-         * it is not important if open_basedir is set - we just cannot read the file
-         * so we try to move it
-        if ('' != ini_get('open_basedir')) {
-         */
-
-        // check tmp dir config
-        if (empty($GLOBALS['cfg']['TempDir'])) {
-            $GLOBALS['cfg']['TempDir'] = 'tmp/';
-        }
-
-        // surpress warnings from beeing displayed, but not from beeing logged
-        ob_start();
-        // check tmp dir
-        if (! is_dir($GLOBALS['cfg']['TempDir'])) {
-            // try to create the tmp directory
-            if (@mkdir($GLOBALS['cfg']['TempDir'], 0777)) {
-                chmod($GLOBALS['cfg']['TempDir'], 0777);
-            } else {
-                // create tmp dir failed
-                $this->_error_message = $GLOBALS['strFieldInsertFromFileTempDirNotExists'];
-                ob_end_clean();
-                return false;
-            }
-        }
-        ob_end_clean();
-
-        if (! is_writable($GLOBALS['cfg']['TempDir'])) {
+        if (empty($GLOBALS['cfg']['TempDir']) || ! is_writable($GLOBALS['cfg']['TempDir'])) {
             // cannot create directory or access, point user to FAQ 1.11
             $this->_error_message = $GLOBALS['strFieldInsertFromFileTempDirNotExists'];
             return false;
         }
 
-        $new_file_to_upload = $GLOBALS['cfg']['TempDir'] . '/' . basename($this->getName());
+        $new_file_to_upload = tempnam(realpath($GLOBALS['cfg']['TempDir']), basename($this->getName()));
 
-        // surpress warnings from beeing displayed, but not from beeing logged
+        // suppress warnings from being displayed, but not from being logged
         // any file access outside of open_basedir will issue a warning
         ob_start();
         $move_uploaded_file_result = move_uploaded_file($this->getName(), $new_file_to_upload);
@@ -602,7 +575,7 @@ class PMA_File
      */
     function _detectCompression()
     {
-        // surpress warnings from beeing displayed, but not from beeing logged
+        // suppress warnings from being displayed, but not from being logged
         // f.e. any file access outside of open_basedir will issue a warning
         ob_start();
         $file = fopen($this->getName(), 'rb');
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/file_listing.php phpMyAdmin-2.11.10.1-all-languages/libraries/file_listing.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/file_listing.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/file_listing.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Functions for listing directories
  *
- * @version $Id: file_listing.php 11001 2007-12-15 14:30:37Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/footer.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/footer.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/footer.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/footer.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -42,7 +42,7 @@
  * @uses    PMA_DBI_close()
  * @uses    basename()
  * @uses    file_exists()
- * @version $Id: footer.inc.php 11402 2008-07-15 18:42:50Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/get_foreign.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/get_foreign.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/get_foreign.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/get_foreign.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: get_foreign.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/grab_globals.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/grab_globals.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/grab_globals.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/grab_globals.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -6,7 +6,7 @@
  * variables from them. It does the same work for $HTTP_ACCEPT_LANGUAGE and 
  * $HTTP_AUTHORIZATION.
  *
- * @version $Id: grab_globals.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/header_http.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/header_http.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/header_http.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/header_http.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: header_http.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/header.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/header.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/header.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/header.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: header.inc.php 11422 2008-07-24 17:12:32Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/header_meta_style.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/header_meta_style.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/header_meta_style.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/header_meta_style.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: header_meta_style.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/header_printview.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/header_printview.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/header_printview.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/header_printview.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: header_printview.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/iconv_wrapper.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/iconv_wrapper.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/iconv_wrapper.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/iconv_wrapper.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: iconv_wrapper.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import/csv.php phpMyAdmin-2.11.10.1-all-languages/libraries/import/csv.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import/csv.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import/csv.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * CSV import plugin for phpMyAdmin
  *
  * @todo    add an option for handling NULL values
- * @version $Id: csv.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import/docsql.php phpMyAdmin-2.11.10.1-all-languages/libraries/import/docsql.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import/docsql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import/docsql.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * DocSQL import plugin for phpMyAdmin
  *
- * @version $Id: docsql.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import/ldi.php phpMyAdmin-2.11.10.1-all-languages/libraries/import/ldi.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import/ldi.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import/ldi.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * CSV import plugin for phpMyAdmin
  *
- * @version $Id: ldi.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import/README phpMyAdmin-2.11.10.1-all-languages/libraries/import/README
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import/README	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import/README	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@ messages with their definition in langua
 plugins for your use, you can use directly texts in plugin.
 
 <?php
-/* $Id: README 9609 2006-10-26 10:52:15Z nijel $ */
+/* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4 ft=php:
 
 /* Demo import plugin for phpMyAdmin */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import/sql.php phpMyAdmin-2.11.10.1-all-languages/libraries/import/sql.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import/sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import/sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * SQL import plugin for phpMyAdmin
  *
- * @version $Id: sql.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/import.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/import.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/import.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/import.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Library that provides common import functions that are used by import plugins
  *
- * @version $Id: import.lib.php 11451 2008-08-01 20:02:21Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/information_schema_relations.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/information_schema_relations.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/information_schema_relations.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/information_schema_relations.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: information_schema_relations.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/ip_allow_deny.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/ip_allow_deny.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/ip_allow_deny.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/ip_allow_deny.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * This library is used with the server IP allow/deny host authentication
  * feature
  *
- * @version $Id: ip_allow_deny.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/js_escape.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/js_escape.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/js_escape.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/js_escape.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -6,7 +6,7 @@
  * @author Michal Čihař <michal@cihar.com>
  * @package phpMyAdmin
  *
- * @version $Id: js_escape.lib.php 11604 2008-09-22 14:09:44Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/kanji-encoding.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/kanji-encoding.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/kanji-encoding.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/kanji-encoding.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -9,7 +9,7 @@
  *
  * 2002/2/22 - by Yukihiro Kawada <kawada@den.fujifilm.co.jp>
  *
- * @version $Id: kanji-encoding.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/language.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/language.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/language.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/language.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * phpMyAdmin Language Loading File
  *
- * @version $Id: language.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/List.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/List.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/List.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/List.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * hold the PMA_List base class
  *
- * @version $Id: List.class.php 10786 2007-10-14 12:23:22Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/List_Database.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/List_Database.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/List_Database.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/List_Database.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * holds the PMA_List_Database class
  *
- * @version $Id: List_Database.class.php 10913 2007-11-09 21:24:40Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/mcrypt.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/mcrypt.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/mcrypt.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/mcrypt.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: mcrypt.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/mult_submits.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/mult_submits.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/mult_submits.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/mult_submits.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: mult_submits.inc.php 11344 2008-06-24 17:33:50Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/mysql_charsets.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/mysql_charsets.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/mysql_charsets.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/mysql_charsets.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: mysql_charsets.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/navigation_header.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/navigation_header.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/navigation_header.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/navigation_header.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * displays the pma logo, links and db and server selection in left frame
  *
- * @version $Id: navigation_header.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/ob.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/ob.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/ob.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/ob.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -9,7 +9,7 @@
  * Check for all the needed functions for output buffering
  * Make some wrappers for the top and bottoms of our files.
  *
- * @version $Id: ob.lib.php 10892 2007-11-01 20:48:43Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/opendocument.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/opendocument.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/opendocument.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/opendocument.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Simple interface for creating OASIS OpenDocument files.
  *
- * @version $Id: opendocument.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/parse_analyze.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/parse_analyze.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/parse_analyze.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/parse_analyze.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: parse_analyze.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/plugin_interface.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/plugin_interface.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/plugin_interface.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/plugin_interface.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Generic plugin interface.
  *
- * @version $Id: plugin_interface.lib.php 11421 2008-07-23 16:55:33Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/relation_cleanup.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/relation_cleanup.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/relation_cleanup.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/relation_cleanup.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used for cleaning up phpMyAdmin tables
  *
- * @version $Id: relation_cleanup.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/relation.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/relation.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/relation.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/relation.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @version $Id: relation.lib.php 11376 2008-07-09 14:17:19Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sanitizing.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/sanitizing.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sanitizing.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sanitizing.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,22 +2,31 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: sanitizing.lib.php 10298 2007-04-17 17:08:12Z lem9 $
+ * @version $Id$
  */
 
 /**
  * Sanitizes $message, taking into account our special codes
- * for formatting
+ * for formatting.
+ *
+ * If you want to include result in element attribute, you should escape it.
+ *
+ * Examples:
+ *
+ * <p><?php echo PMA_sanitize($foo); ?></p>
+ *
+ * <a title="<?php echo PMA_sanitize($foo, true); ?>">bar</a>
  *
  * @uses    preg_replace()
  * @uses    strtr()
  * @param   string   the message
+ * @param   boolean  whether to escape html in result
  *
  * @return  string   the sanitized message
  *
  * @access  public
  */
-function PMA_sanitize($message)
+function PMA_sanitize($message, $escape = false)
 {
     $replace_pairs = array(
         '<'         => '&lt;',
@@ -65,6 +74,10 @@ function PMA_sanitize($message)
         $message = preg_replace($pattern, '<a href="\1" target="\2">', $message);
     }
 
+    if ($escape) {
+        $message = htmlspecialchars($message);
+    }
+
     return $message;
 }
 ?>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/select_lang.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/select_lang.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/select_lang.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/select_lang.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * phpMyAdmin Language Loading File
  *
- * @version $Id: select_lang.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/select_server.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/select_server.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/select_server.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/select_server.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Code for displaying server selection written by nijel
  *
- * @version $Id: select_server.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/server_common.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/server_common.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/server_common.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/server_common.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -7,7 +7,7 @@
  * @uses    PMA_DBI_fetch_result()
  * @uses    PMA_DBI_QUERY_STORE
  * @uses    $userlink
- * @version $Id: server_common.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/server_links.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/server_links.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/server_links.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/server_links.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/session.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/session.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/session.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/session.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * session handling
  *
- * @version $Id: session.inc.php 11450 2008-08-01 19:15:01Z lem9 $
+ * @version $Id$
  * @todo    add failover or warn if sessions are not configured properly
  * @todo    add an option to use mm-module for session handler
  * @see     http://www.php.net/session
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sqlparser.data.php phpMyAdmin-2.11.10.1-all-languages/libraries/sqlparser.data.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sqlparser.data.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sqlparser.data.php	2010-08-20 13:47:14.000000000 +0700
@@ -19,7 +19,7 @@
  * It's easier to use only uppercase for proper sorting. In case of
  * doubt, use the DEBUG code after this function's definition.
  *
- * @version$Id: sqlparser.data.php 11345 2008-06-24 17:51:49Z lem9 $
+ * @version$Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sqlparser.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/sqlparser.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sqlparser.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sqlparser.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -27,7 +27,7 @@
  * page for it to work, I recommend '<link rel="stylesheet" type="text/css"
  * href="syntax.css.php" />' at the moment.)
  *
- * @version $Id: sqlparser.lib.php 11513 2008-08-28 16:17:53Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -152,7 +152,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
     {
         global $SQP_errorString;
         $debugstr = 'ERROR: ' . $message . "\n";
-        $debugstr .= 'SVN: $Id: sqlparser.lib.php 11513 2008-08-28 16:17:53Z lem9 $' . "\n";
+        $debugstr .= 'SVN: $Id$' . "\n";
         $debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
         $debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
         $debugstr .= 'PMA: ' . PMA_VERSION . "\n";
@@ -2425,7 +2425,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             }
             $after                 .= "\n";
 */
-            $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : $arr[$i]['data']). $after;
+            $str .= $before . ($mode=='color' ? PMA_SQP_formatHTML_colorize($arr[$i]) : htmlspecialchars($arr[$i]['data'])). $after;
         } // end for
         if ($mode=='color') {
             $str .= '</span>';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sql_query_form.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/sql_query_form.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sql_query_form.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sql_query_form.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * functions for displaying the sql query form
  *
- * @version $Id: sql_query_form.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  * @usedby  server_sql.php
  * @usedby  db_sql.php
  * @usedby  tbl_sql.php
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sqlvalidator.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/sqlvalidator.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sqlvalidator.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sqlvalidator.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -25,7 +25,7 @@
 *
 * @author   Robin Johnson <robbat2@users.sourceforge.net>
 *
-* @version  $Id: sqlvalidator.class.php 11335 2008-06-21 14:01:54Z lem9 $
+* @version  $Id$
 */
 if (! defined('PHPMYADMIN')) {
     exit;
@@ -179,7 +179,7 @@ if (!function_exists('class_exists') || 
             $this->username                      = 'anonymous';
             $this->password                      = '';
             $this->calling_program               = 'PHP_SQLValidator';
-            $this->calling_program_version       = '$Revision: 11335 $';
+            $this->calling_program_version       = '$Revision$';
             $this->target_dbms                   = 'N/A';
             $this->target_dbms_version           = 'N/A';
             $this->connection_technology         = 'PHP';
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/sqlvalidator.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/sqlvalidator.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/sqlvalidator.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/sqlvalidator.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -27,7 +27,7 @@
  *
  * Also set a username and password if you have a private one
  *
- * @version $Id: sqlvalidator.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/StorageEngine.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/StorageEngine.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/StorageEngine.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/StorageEngine.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Library for extracting information about the available storage engines
  *
- * @version $Id: StorageEngine.class.php 10654 2007-09-20 16:25:32Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/string.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/string.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/string.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/string.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id: string.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  * @uses    PMA_PHP_INT_VERSION
  * @uses    PMA_dl()
  * @uses    extension_loaded()
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/string_mb.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/string_mb.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/string_mb.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/string_mb.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id: string_mb.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/string_native.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/string_native.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/string_native.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/string_native.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id: string_native.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/string_type_ctype.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/string_type_ctype.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/string_type_ctype.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/string_type_ctype.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id: string_type_ctype.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/string_type_native.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/string_type_native.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/string_type_native.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/string_type_native.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
  *
  * The SQL Parser code relies heavily on these functions.
  *
- * @version $Id: string_type_native.lib.php 10294 2007-04-17 11:59:09Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/Table.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/Table.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/Table.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/Table.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: Table.class.php 11353 2008-06-27 14:27:18Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_common.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_common.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_common.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_common.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_common.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_indexes.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_indexes.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_indexes.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_indexes.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * function library for handling table indexes
  *
- * @version $Id: tbl_indexes.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_info.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_info.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_info.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_info.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_info.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_links.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_links.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_links.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_links.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_links.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_properties.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_properties.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_properties.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_properties.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_properties.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_replace_fields.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_replace_fields.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_replace_fields.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_replace_fields.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -17,7 +17,7 @@
  *
  * note: grab_globals has extracted the fields from _FILES or HTTP_POST_FILES
  *
- * @version $Id: tbl_replace_fields.inc.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  *
  * @uses $_REQUEST
  * @uses defined()
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_triggers.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_triggers.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tbl_triggers.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tbl_triggers.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_triggers.lib.php 11335 2008-06-21 14:01:54Z lem9 $
+ * @version $Id$
  */
 if (! defined('PHPMYADMIN')) {
     exit;
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/tcpdf/font/LICENSE phpMyAdmin-2.11.10.1-all-languages/libraries/tcpdf/font/LICENSE
--- phpMyAdmin-2.11.9.6-all-languages/libraries/tcpdf/font/LICENSE	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/tcpdf/font/LICENSE	2010-08-20 13:47:14.000000000 +0700
@@ -95,4 +95,4 @@ dealings in this Font Software without p
 from Tavmjong Bah. For further information, contact: tavmjong @ free
 . fr.
 
-$Id: LICENSE 10140 2007-03-20 08:32:55Z cybot_tm $
+$Id$
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/Theme.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/Theme.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/Theme.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/Theme.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * hold PMA_Theme class
  *
- * @version $Id: Theme.class.php 11035 2008-01-05 13:33:05Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/Theme_Manager.class.php phpMyAdmin-2.11.10.1-all-languages/libraries/Theme_Manager.class.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/Theme_Manager.class.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/Theme_Manager.class.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: Theme_Manager.class.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/application_octetstream__download.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/application_octetstream__download.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/application_octetstream__download.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/application_octetstream__download.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: application_octetstream__download.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/application_octetstream__hex.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/application_octetstream__hex.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/application_octetstream__hex.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/application_octetstream__hex.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: application_octetstream__hex.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/generator.sh phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/generator.sh
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/generator.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/generator.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: generator.sh 9537 2006-10-12 16:27:13Z nijel $
+# $Id$
 #
 # Shell script that adds a new function file using a template. Should not be called directly
 # but instead by template_Generator.sh and template_generator_mimetype.sh
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/global.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/global.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/global.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/global.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -19,7 +19,7 @@
  *
  * Please provide a comment for your function, what it does and what parameters are available.
  *
- * @version $Id: global.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_jpeg__inline.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_jpeg__inline.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_jpeg__inline.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_jpeg__inline.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: image_jpeg__inline.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_jpeg__link.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_jpeg__link.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_jpeg__link.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_jpeg__link.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: image_jpeg__link.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_png__inline.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_png__inline.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/image_png__inline.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/image_png__inline.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: image_png__inline.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/TEMPLATE phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/TEMPLATE
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/TEMPLATE	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/TEMPLATE	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: TEMPLATE 5208 2003-11-26 22:52:25Z rabus $ */
+/* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/template_generator_mimetype.sh phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/template_generator_mimetype.sh
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/template_generator_mimetype.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/template_generator_mimetype.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: template_generator_mimetype.sh 9537 2006-10-12 16:27:13Z nijel $
+# $Id$
 #
 # Shell script that adds a new mimetype without transform function.
 #
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/template_generator.sh phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/template_generator.sh
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/template_generator.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/template_generator.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: template_generator.sh 9537 2006-10-12 16:27:13Z nijel $
+# $Id$
 #
 # Shell script that adds a new mimetype with transform function.
 #
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/TEMPLATE_MIMETYPE phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/TEMPLATE_MIMETYPE
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/TEMPLATE_MIMETYPE	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/TEMPLATE_MIMETYPE	2010-08-20 13:47:14.000000000 +0700
@@ -1,5 +1,5 @@
 <?php
-/* $Id: TEMPLATE_MIMETYPE 5208 2003-11-26 22:52:25Z rabus $ */
+/* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__dateformat.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__dateformat.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__dateformat.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__dateformat.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__dateformat.inc.php 11084 2008-01-27 14:07:50Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__external.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__external.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__external.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__external.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__external.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__formatted.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__formatted.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__formatted.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__formatted.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__formatted.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__imagelink.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__imagelink.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__imagelink.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__imagelink.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__imagelink.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__link.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__link.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__link.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__link.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__link.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__sql.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__sql.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__sql.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__sql.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__sql.inc.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__substr.inc.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__substr.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations/text_plain__substr.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations/text_plain__substr.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: text_plain__substr.inc.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/transformations.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/transformations.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/transformations.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/transformations.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Set of functions used with the relation and pdf feature
  *
- * @version $Id: transformations.lib.php 10211 2007-03-27 13:07:49Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/unzip.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/unzip.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/unzip.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/unzip.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* $Id: unzip.lib.php 10142 2007-03-20 10:32:13Z cybot_tm $ */
+/* $Id$ */
 
     /**
      *  ZIP file unpack classes. Contributed to the phpMyAdmin project.
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/url_generating.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/url_generating.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/url_generating.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/url_generating.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * URL/hidden inputs generating.
  *
- * @version $Id: url_generating.lib.php 10229 2007-03-30 09:12:05Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/libraries/zip.lib.php phpMyAdmin-2.11.10.1-all-languages/libraries/zip.lib.php
--- phpMyAdmin-2.11.9.6-all-languages/libraries/zip.lib.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/libraries/zip.lib.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: zip.lib.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/license.php phpMyAdmin-2.11.10.1-all-languages/license.php
--- phpMyAdmin-2.11.9.6-all-languages/license.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/license.php	2010-08-20 13:47:14.000000000 +0700
@@ -6,7 +6,7 @@
  * Note: please do not fold this script into a general script
  * that would read any file using a GET parameter, it would open a hole
  *
- * @version $Id: license.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/main.php phpMyAdmin-2.11.10.1-all-languages/main.php
--- phpMyAdmin-2.11.9.6-all-languages/main.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/main.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: main.php 12304 2009-03-24 12:56:58Z nijel $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/navigation.php phpMyAdmin-2.11.10.1-all-languages/navigation.php
--- phpMyAdmin-2.11.9.6-all-languages/navigation.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/navigation.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * the navigation frame - displays server, db and table selection tree
  *
- * @version $Id: navigation.php 11320 2008-06-12 20:00:23Z lem9 $
+ * @version $Id$
  * @uses $GLOBALS['PMA_List_Database']
  * @uses $GLOBALS['server']
  * @uses $GLOBALS['db']
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pdf_pages.php phpMyAdmin-2.11.10.1-all-languages/pdf_pages.php
--- phpMyAdmin-2.11.9.6-all-languages/pdf_pages.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pdf_pages.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pdf_pages.php 13034 2009-10-12 21:47:40Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pdf_schema.php phpMyAdmin-2.11.10.1-all-languages/pdf_schema.php
--- phpMyAdmin-2.11.9.6-all-languages/pdf_schema.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pdf_schema.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Contributed by Maxime Delorme and merged by lem9
  *
- * @version $Id: pdf_schema.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/phpinfo.php phpMyAdmin-2.11.10.1-all-languages/phpinfo.php
--- phpMyAdmin-2.11.9.6-all-languages/phpinfo.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/phpinfo.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: phpinfo.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/phpmyadmin.css.php phpMyAdmin-2.11.10.1-all-languages/phpmyadmin.css.php
--- phpMyAdmin-2.11.9.6-all-languages/phpmyadmin.css.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/phpmyadmin.css.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: phpmyadmin.css.php 11450 2008-08-01 19:15:01Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/ajax.js phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/ajax.js
--- phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/ajax.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/ajax.js	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: ajax.js 10385 2007-05-14 07:49:56Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/iecanvas.js phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/iecanvas.js
--- phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/iecanvas.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/iecanvas.js	2010-08-20 13:47:14.000000000 +0700
@@ -1,7 +1,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: iecanvas.js 10149 2007-03-20 15:11:15Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/move.js phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/move.js
--- phpMyAdmin-2.11.9.6-all-languages/pmd/scripts/move.js	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd/scripts/move.js	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: move.js 10416 2007-05-30 16:55:18Z lem9 $
+ * @version $Id$
  * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
  * @package phpMyAdmin-Designer
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd/styles/default/style1.css phpMyAdmin-2.11.10.1-all-languages/pmd/styles/default/style1.css
--- phpMyAdmin-2.11.9.6-all-languages/pmd/styles/default/style1.css	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd/styles/default/style1.css	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * @version $Id: style1.css 10219 2007-03-28 16:36:12Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 body {
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_common.php phpMyAdmin-2.11.10.1-all-languages/pmd_common.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_common.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_common.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
- * @version $Id: pmd_common.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_display_field.php phpMyAdmin-2.11.10.1-all-languages/pmd_display_field.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_display_field.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_display_field.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
- * @version $Id: pmd_display_field.php 10149 2007-03-20 15:11:15Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_general.php phpMyAdmin-2.11.10.1-all-languages/pmd_general.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_general.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_general.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * @author  Ivan A Kirillov (Ivan.A.Kirillov@gmail.com)
- * @version $Id: pmd_general.php 10413 2007-05-26 18:31:40Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_help.php phpMyAdmin-2.11.10.1-all-languages/pmd_help.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_help.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_help.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pmd_help.php 10149 2007-03-20 15:11:15Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_pdf.php phpMyAdmin-2.11.10.1-all-languages/pmd_pdf.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_pdf.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_pdf.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pmd_pdf.php 13034 2009-10-12 21:47:40Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_relation_new.php phpMyAdmin-2.11.10.1-all-languages/pmd_relation_new.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_relation_new.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_relation_new.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pmd_relation_new.php 11132 2008-02-21 17:42:07Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_relation_upd.php phpMyAdmin-2.11.10.1-all-languages/pmd_relation_upd.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_relation_upd.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_relation_upd.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pmd_relation_upd.php 11132 2008-02-21 17:42:07Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/pmd_save_pos.php phpMyAdmin-2.11.10.1-all-languages/pmd_save_pos.php
--- phpMyAdmin-2.11.9.6-all-languages/pmd_save_pos.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/pmd_save_pos.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: pmd_save_pos.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-Designer
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/querywindow.php phpMyAdmin-2.11.10.1-all-languages/querywindow.php
--- phpMyAdmin-2.11.9.6-all-languages/querywindow.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/querywindow.php	2010-08-20 13:47:14.000000000 +0700
@@ -38,7 +38,7 @@
  * @uses    strlen()
  * @uses    preg_replace()
  * @uses    htmlspecialchars()
- * @version $Id: querywindow.php 11376 2008-07-09 14:17:19Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/README phpMyAdmin-2.11.10.1-all-languages/README
--- phpMyAdmin-2.11.9.6-all-languages/README	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/README	2010-08-20 13:47:14.000000000 +0700
@@ -1,16 +1,16 @@
-$Id: README 13041 2009-10-12 22:27:06Z lem9 $
+$Id$
 
 phpMyAdmin - Readme
 ===================
 
   A set of PHP-scripts to manage MySQL over the web.
 
-  Version 2.11.9.6
-  ----------------
+  Version 2.11.10.1
+  -----------------
   http://www.phpmyadmin.net/
 
     Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2008 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
+    Copyright (C) 2001-2009 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca>
                             Olivier Müller <om_at_omnis.ch>
                             Robin Johnson <robbat2_at_users.sourceforge.net>
                             Alexander M. Turek <me_at_derrabus.de>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/readme.php phpMyAdmin-2.11.10.1-all-languages/readme.php
--- phpMyAdmin-2.11.9.6-all-languages/readme.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/readme.php	2010-08-20 13:47:14.000000000 +0700
@@ -6,7 +6,7 @@
  * Note: please do not fold this script into a general script
  * that would read any file using a GET parameter, it would open a hole
  *
- * @version $Id: readme.php 10142 2007-03-20 10:32:13Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/RELEASE-DATE-2.11.10.1 phpMyAdmin-2.11.10.1-all-languages/RELEASE-DATE-2.11.10.1
--- phpMyAdmin-2.11.9.6-all-languages/RELEASE-DATE-2.11.10.1	1970-01-01 07:00:00.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/RELEASE-DATE-2.11.10.1	2010-08-20 13:47:14.000000000 +0700
@@ -0,0 +1 @@
+Fri Aug 20 11:47:13 UTC 2010
diff -rupN phpMyAdmin-2.11.9.6-all-languages/RELEASE-DATE-2.11.9.6 phpMyAdmin-2.11.10.1-all-languages/RELEASE-DATE-2.11.9.6
--- phpMyAdmin-2.11.9.6-all-languages/RELEASE-DATE-2.11.9.6	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/RELEASE-DATE-2.11.9.6	1970-01-01 07:00:00.000000000 +0700
@@ -1 +0,0 @@
-Mon Oct 12 22:27:47 UTC 2009
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/check_lang.php phpMyAdmin-2.11.10.1-all-languages/scripts/check_lang.php
--- phpMyAdmin-2.11.9.6-all-languages/scripts/check_lang.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/check_lang.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * This test script checks all the language files to ensure there is no errors
  * inside and nothing is displayed on screen (eg no extra no blank line).
  *
- * @version $Id: check_lang.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-test
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/convertcfg.pl phpMyAdmin-2.11.10.1-all-languages/scripts/convertcfg.pl
--- phpMyAdmin-2.11.9.6-all-languages/scripts/convertcfg.pl	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/convertcfg.pl	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: convertcfg.pl 5152 2003-11-18 15:20:45Z nijel $
+# $Id$
 #
 # Configuration converter
 # Converts from old-style (Pre-2.3) configuration files to new format found in PMA-2.3
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/create-release.sh phpMyAdmin-2.11.10.1-all-languages/scripts/create-release.sh
--- phpMyAdmin-2.11.9.6-all-languages/scripts/create-release.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/create-release.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: create-release.sh 11913 2008-11-21 08:58:00Z nijel $
+# $Id$
 # vim: expandtab sw=4 ts=4 sts=4:
 #
 # 2005-09-13, lem9@users.sourceforge.net
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/create_tables_mysql_4_1_2+.sql phpMyAdmin-2.11.10.1-all-languages/scripts/create_tables_mysql_4_1_2+.sql
--- phpMyAdmin-2.11.9.6-all-languages/scripts/create_tables_mysql_4_1_2+.sql	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/create_tables_mysql_4_1_2+.sql	2010-08-20 13:47:14.000000000 +0700
@@ -16,7 +16,7 @@
 --                                                  
 -- Please don't forget to set up the tablenames in config.inc.php                                 
 -- 
--- $Id: create_tables_mysql_4_1_2+.sql 9676 2006-11-07 14:16:18Z lem9 $
+-- $Id$
 
 -- --------------------------------------------------------
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/create_tables.sql phpMyAdmin-2.11.10.1-all-languages/scripts/create_tables.sql
--- phpMyAdmin-2.11.9.6-all-languages/scripts/create_tables.sql	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/create_tables.sql	2010-08-20 13:47:14.000000000 +0700
@@ -12,7 +12,7 @@
 --                                                  
 -- Please don't forget to set up the tablenames in config.inc.php                                 
 -- 
--- $Id: create_tables.sql 10257 2007-04-07 14:40:24Z lem9 $
+-- $Id$
 
 -- --------------------------------------------------------
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/decode_bug.php phpMyAdmin-2.11.10.1-all-languages/scripts/decode_bug.php
--- phpMyAdmin-2.11.9.6-all-languages/scripts/decode_bug.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/decode_bug.php	2010-08-20 13:47:14.000000000 +0700
@@ -8,7 +8,7 @@
  *
  * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net>
  *
- * @version $Id: decode_bug.php 10289 2007-04-16 13:32:45Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-debug
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/lang-cleanup.sh phpMyAdmin-2.11.10.1-all-languages/scripts/lang-cleanup.sh
--- phpMyAdmin-2.11.9.6-all-languages/scripts/lang-cleanup.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/lang-cleanup.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: lang-cleanup.sh 9504 2006-10-06 09:02:46Z nijel $
+# $Id$
 # vim: expandtab sw=4 ts=4 sts=4:
 #
 # Script for removing language selection from phpMyAdmin
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/remove_control_m.sh phpMyAdmin-2.11.10.1-all-languages/scripts/remove_control_m.sh
--- phpMyAdmin-2.11.9.6-all-languages/scripts/remove_control_m.sh	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/remove_control_m.sh	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: remove_control_m.sh 5152 2003-11-18 15:20:45Z nijel $
+# $Id$
 #
 # Script to remove ^M from files for DOS <-> UNIX conversions
 #
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/setup.php phpMyAdmin-2.11.10.1-all-languages/scripts/setup.php
--- phpMyAdmin-2.11.9.6-all-languages/scripts/setup.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/setup.php	2010-08-20 13:47:14.000000000 +0700
@@ -10,7 +10,7 @@
  * @author     Michal Čihař <michal@cihar.com>
  * @copyright  2006 Michal Čihař <michal@cihar.com>
  * @license    http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
- * @version    $Id: setup.php 12304 2009-03-24 12:56:58Z nijel $
+ * @version    $Id$
  */
 
 // Grab phpMyAdmin version and PMA_dl function
@@ -26,7 +26,7 @@ $PMA_Config_Setup = new PMA_Config();
 
 // Script information
 $script_info = 'phpMyAdmin ' . $PMA_Config_Setup->get('PMA_VERSION') . ' setup script by Michal Čihař <michal@cihar.com>';
-$script_version = '$Id: setup.php 12304 2009-03-24 12:56:58Z nijel $';
+$script_version = '$Id$';
 
 // Grab action
 if (isset($_POST['action'])) {
@@ -37,35 +37,32 @@ if (isset($_POST['action'])) {
 
 // Grab wanted CRLF type
 if (isset($_POST['eoltype'])) {
-    $eoltype = $_POST['eoltype'];
+    $_SESSION['eoltype'] = $_POST['eoltype'];
 } else {
     if (PMA_USR_OS == 'Win') {
-        $eoltype = 'dos';
+        $_SESSION['eoltype'] = 'dos';
     } else {
-        $eoltype = 'unix';
+        $_SESSION['eoltype'] = 'unix';
     }
 }
 
 // Detect which CRLF to use
-if ($eoltype == 'dos') {
+if ($_SESSION['eoltype'] == 'dos') {
     $crlf = "\r\n";
-} elseif ($eoltype == 'mac') {
+} elseif ($_SESSION['eoltype'] == 'mac') {
     $crlf = "\r";
 } else {
     $crlf = "\n";
 }
 
-if (isset($_POST['configuration']) && $action != 'clear') {
-    // Grab previous configuration, if it should not be cleared
-    $configuration = unserialize($_POST['configuration']);
-} else {
-    // Start with empty configuration
-    $configuration = array();
+if (!isset($_SESSION['configuration']) || $action == 'clear') {
+    // Create empty configuration
+    $_SESSION['configuration'] = array();
 }
 
 // We rely on Servers array to exist, so create it here
-if (!isset($configuration['Servers']) || !is_array($configuration['Servers'])) {
-    $configuration['Servers'] = array();
+if (!isset($_SESSION['configuration']['Servers']) || !is_array($_SESSION['configuration']['Servers'])) {
+    $_SESSION['configuration']['Servers'] = array();
 }
 
 // Used later
@@ -341,20 +338,6 @@ function message($type, $text, $title = 
 }
 
 /**
- * Creates hidden input required for keeping current configuraion
- *
- * @return string   HTML with hidden inputs
- */
-function get_hidden_cfg() {
-    global $configuration, $eoltype;
-
-    $ret = '<input type="hidden" name="configuration" value="' . htmlspecialchars(serialize($configuration)) . '" />' . "\n";
-    $ret .= '<input type="hidden" name="eoltype" value="' . htmlspecialchars($eoltype) . '" />' . "\n";
-
-    return $ret;
-}
-
-/**
  * Returns needed hidden input for forms.
  *
  * @return  string HTML with hidden inputs
@@ -383,7 +366,6 @@ function get_action($name, $title, $adde
         $ret .= ' disabled="disabled"';
     }
     $ret .= ' />';
-    $ret .= get_hidden_cfg();
     $ret .= '</form>';
     $ret .= "\n";
     return $ret;
@@ -536,6 +518,7 @@ function get_cfg_val($name, $val) {
                 }
             }
             if ($type == 'string') {
+                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
                 $ret .= get_cfg_val($name . "['$k']", $v);
             } elseif ($type == 'int') {
                 $ret .= '    ' . PMA_var_export($v) . ',' . $crlf;
@@ -613,7 +596,7 @@ function compress_servers(&$cfg) {
  * @param   string   list of values to grab, values are separated by ";",
  *                   each can have defined type separated by ":", if no type
  *                   is defined, string is assumed. Possible types: bool -
- *                   boolean value, serialized - serialized value, int -
+ *                   boolean value, allow-deny - allow-deny rules, int -
  *                   integer, tristate - "TRUE"/"FALSE" converted to bool,
  *                   other strings are kept.
  *
@@ -632,9 +615,17 @@ function grab_values($list)
             case 'bool':
                 $res[$v[0]] = isset($_POST[$v[0]]);
                 break;
-            case 'serialized':
-                if (isset($_POST[$v[0]]) && strlen($_POST[$v[0]]) > 0) {
-                    $res[$v[0]] = unserialize($_POST[$v[0]]);
+            case 'allow-deny':
+                $res[$v[0]] = array();
+                if (isset($_POST[$v[0] . '_order']) && strlen($_POST[$v[0] . '_order']) > 0) {
+                    $res[$v[0]]['order'] = $_POST[$v[0]];
+                } else {
+                    $res[$v[0]]['order'] = '';
+                }
+                if (isset($_POST[$v[0] . '_rules']) && strlen($_POST[$v[0] . '_rules']) > 0) {
+                    $res[$v[0]]['rules'] = split('|', $_POST[$v[0]]);
+                } else {
+                    $res[$v[0]]['rules'] = array();
                 }
                 break;
             case 'int':
@@ -819,7 +810,6 @@ function show_security_form($defaults = 
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_security_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Blowfish secret', 'blowfish_secret', 'Secret passphrase used for encrypting cookies'),
             array('Force SSL connection', 'ForceSSL', 'Whether to force using secured connection while using phpMyAdmin', FALSE),
@@ -850,7 +840,6 @@ function show_manual_form($defaults = ar
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_manual_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Type of MySQL documentation', 'MySQLManualType', 'These types are same as listed on MySQL download page', array('viewable', 'chapters', 'big', 'none')),
             array('Base URL of MySQL documentation', 'MySQLManualBase', 'Where is MySQL documentation placed, this is usually top level directory.'),
@@ -877,7 +866,6 @@ function show_charset_form($defaults = a
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_charset_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Allow charset conversion', 'AllowAnywhereRecoding', 'If you want to use such functions.', FALSE),
             array('Default charset', 'DefaultCharset', 'Default charset for conversion.', $PMA_Config_Setup->get('AvailableCharsets')),
@@ -905,7 +893,6 @@ function show_extensions_form($defaults 
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_extensions_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('GD 2 is available', 'GD2Available', 'Whether you have GD 2 or newer installed', array('auto', 'yes', 'no')),
             ),
@@ -931,7 +918,6 @@ function show_relation_form($defaults = 
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_relation_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Permanent query history', 'QueryHistoryDB', 'Store history into database.', FALSE),
             array('Maximal history size', 'QueryHistoryMax', 'How many queries are kept in history.'),
@@ -959,7 +945,6 @@ function show_upload_form($defaults = ar
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="feat_upload_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Upload directory', 'UploadDir', 'Directory on server where you can upload files for import'),
             array('Save directory', 'SaveDir', 'Directory where exports can be saved on server'),
@@ -985,14 +970,21 @@ function show_server_form($defaults = ar
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="addserver_real" />
     <?php
-        echo get_hidden_cfg();
         if (!($number === FALSE)) {
             echo '<input type="hidden" name="server" value="' . $number . '" />';
         }
-        $hi = array ('bookmarktable', 'relation', 'table_info', 'table_coords', 'pdf_pages', 'column_info', 'designer_coords', 'history', 'AllowDeny');
+        $hi = array ('bookmarktable', 'relation', 'table_info', 'table_coords', 'pdf_pages', 'column_info', 'designer_coords', 'history');
         foreach ($hi as $k) {
-            if (isset($defaults[$k]) && (!is_string($defaults[$k]) || strlen($defaults[$k]) > 0)) {
-                echo '<input type="hidden" name="' . $k . '" value="' . htmlspecialchars(serialize($defaults[$k])) . '" />';
+            if (isset($defaults[$k]) && is_string($defaults[$k]) && strlen($defaults[$k]) > 0) {
+                echo '<input type="hidden" name="' . $k . '" value="' . htmlspecialchars($defaults[$k]) . '" />';
+            }
+        }
+        if (isset($defaults['AllowDeny'])) {
+            if (isset($defaults['AllowDeny']['order']) && is_string($defaults['AllowDeny']['order']) && strlen($defaults['AllowDeny']['order']) > 0) {
+                    echo '<input type="hidden" name="AllowDeny_rules" value="' . htmlspecialchars($defaults['AllowDeny']['order']) . '" />';
+            }
+            if (isset($defaults['AllowDeny']['rules']) && is_array($defaults['AllowDeny']['rules']) && count($defaults['AllowDeny']['rules']) > 0) {
+                    echo '<input type="hidden" name="AllowDeny_rules" value="' . htmlspecialchars(implode('|', $defaults['AllowDeny']['rules'])) . '" />';
             }
         }
         show_config_form(array(
@@ -1035,7 +1027,6 @@ function show_left_form($defaults = arra
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_navigation_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Use light version', 'LeftFrameLight', 'Disable this if you want to see all databases at one time.', TRUE),
             array('Display databases in tree', 'LeftFrameDBTree', 'Whether to display databases in tree (determined by separator defined lower)', TRUE),
@@ -1069,7 +1060,6 @@ function show_tabs_form($defaults = arra
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_tabs_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Default tab for server', 'DefaultTabServer', 'Tab that is displayed when entering server', array('main.php', 'server_databases.php', 'server_status.php', 'server_variables.php', 'server_privileges.php', 'server_processlist.php')),
             array('Default tab for database', 'DefaultTabDatabase', 'Tab that is displayed when entering database', array('db_structure.php', 'db_sql.php', 'db_search.php', 'db_operations.php')),
@@ -1097,7 +1087,6 @@ function show_icons_form($defaults = arr
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_icons_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Icons on errors', 'ErrorIconic', 'Whether to use icons in error messages.', TRUE),
             array('Icons on main page', 'MainPageIconic', 'Whether to use icons on main page.', TRUE),
@@ -1126,7 +1115,6 @@ function show_browse_form($defaults = ar
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_browse_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Display of values', 'DefaultDisplay', 'How to list values while browsing', array('horizontal', 'vertical', 'horizontalflipped')),
             array('Hightlight pointer', 'BrowsePointerEnable', 'Whether to highlight row under mouse.', TRUE),
@@ -1156,7 +1144,6 @@ function show_edit_form($defaults = arra
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_edit_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Display of properties while editing', 'DefaultPropDisplay', 'How to list properties (table structure or values) while editing', array('horizontal', 'vertical')),
             array('Number of inserted rows', 'InsertRows', 'How many rows can be inserted at once'),
@@ -1190,7 +1177,6 @@ function show_window_form($defaults = ar
     <?php echo get_hidden_inputs();?>
     <input type="hidden" name="action" value="lay_window_real" />
     <?php
-        echo get_hidden_cfg();
         show_config_form(array(
             array('Edit SQL in window', 'EditInWindow', 'Whether edit links will edit in query window.', TRUE),
             array('Query window height', 'QueryWindowHeight', 'Height of query window'),
@@ -1284,12 +1270,12 @@ switch ($action) {
         header('Content-Type: text/plain');
         header('Content-Disposition: attachment; filename="config.inc.php"');
 
-        echo get_cfg_string($configuration);
+        echo get_cfg_string($_SESSION['configuration']);
         exit;
         break;
     case 'display':
         echo '<form method="none" action=""><textarea name="config" cols="50" rows="20" id="textconfig" wrap="off">' . "\n";
-        echo htmlspecialchars(get_cfg_string($configuration));
+        echo htmlspecialchars(get_cfg_string($_SESSION['configuration']));
         echo '</textarea></form>' . "\n";
         ?>
 <script type="text/javascript">
@@ -1320,7 +1306,7 @@ switch ($action) {
             message('error', 'Could not open config file for writing! Bad permissions?');
             break;
         }
-        $s = get_cfg_string($configuration);
+        $s = get_cfg_string($_SESSION['configuration']);
         $r = fwrite($config, $s);
         if (!$r || $r != strlen($s)) {
             message('error', 'Could not write to config file! Not enough space?');
@@ -1338,14 +1324,14 @@ switch ($action) {
         }
         $new_cfg = load_config('./config/config.inc.php');
         if (!($new_cfg === FALSE)) {
-            $configuration = $new_cfg;
+            $_SESSION['configuration'] = $new_cfg;
         }
         $show_info = TRUE;
         break;
 
     case 'addserver_real':
         if (isset($_POST['submit_save'])) {
-            $new_server = grab_values('host;extension;port;socket;connect_type;compress:bool;controluser;controlpass;auth_type;user;password;only_db;verbose;pmadb;bookmarktable:serialized;relation:serialized;table_info:serialized;table_coords:serialized;pdf_pages:serialized;column_info:serialized;designer_coords:serialized;history:serialized;AllowDeny:serialized;SignonSession;SignonURL;LogoutURL');
+            $new_server = grab_values('host;extension;port;socket;connect_type;compress:bool;controluser;controlpass;auth_type;user;password;only_db;verbose;pmadb;bookmarktable;relation;table_info;table_coords;pdf_pages;column_info;designer_coords;history;AllowDeny:allow-deny;SignonSession;SignonURL;LogoutURL');
             $err = FALSE;
             if (empty($new_server['host'])) {
                 message('error', 'Empty hostname!');
@@ -1423,16 +1409,16 @@ switch ($action) {
                 show_server_form($new_server, isset($_POST['server']) ? $_POST['server'] : FALSE);
             } else {
                 if (isset($_POST['server'])) {
-                    $configuration['Servers'][$_POST['server']] = $new_server;
+                    $_SESSION['configuration']['Servers'][$_POST['server']] = $new_server;
                     message('notice', 'Changed server ' . get_server_name($new_server, $_POST['server']));
                 } else {
-                    $configuration['Servers'][] = $new_server;
+                    $_SESSION['configuration']['Servers'][] = $new_server;
                     message('notice', 'New server added');
                 }
                 $show_info = TRUE;
-                if ($new_server['auth_type'] == 'cookie' && empty($configuration['blowfish_secret'])) {
+                if ($new_server['auth_type'] == 'cookie' && empty($_SESSION['configuration']['blowfish_secret'])) {
                     message('notice', 'You did not have configured blowfish secret and you want to use cookie authentication so I generated blowfish secret for you. It is used to encrypt cookies.', 'Blowfish secret generated');
-                    $configuration['blowfish_secret'] = uniqid('', TRUE);
+                    $_SESSION['configuration']['blowfish_secret'] = uniqid('', TRUE);
                 }
             }
             unset($new_server);
@@ -1441,7 +1427,7 @@ switch ($action) {
         }
         break;
     case 'addserver':
-        if (count($configuration['Servers']) == 0) {
+        if (count($_SESSION['configuration']['Servers']) == 0) {
             // First server will use defaults as in config.default.php
             $defaults = $PMA_Config_Setup->default_server;
             unset($defaults['AllowDeny']); // Ignore this for now
@@ -1474,22 +1460,22 @@ switch ($action) {
         if (!isset($_POST['server'])) {
             footer();
         }
-        show_server_form($configuration['Servers'][$_POST['server']], $_POST['server']);
+        show_server_form($_SESSION['configuration']['Servers'][$_POST['server']], $_POST['server']);
         break;
     case 'deleteserver':
         if (!isset($_POST['server'])) {
             footer();
         }
-        message('notice', 'Deleted server ' . get_server_name($configuration['Servers'][$_POST['server']], $_POST['server']));
-        unset($configuration['Servers'][$_POST['server']]);
-        compress_servers($configuration);
+        message('notice', 'Deleted server ' . get_server_name($_SESSION['configuration']['Servers'][$_POST['server']], $_POST['server']));
+        unset($_SESSION['configuration']['Servers'][$_POST['server']]);
+        compress_servers($_SESSION['configuration']);
         $show_info = TRUE;
         break;
     case 'servers':
-        if (count($configuration['Servers']) == 0) {
+        if (count($_SESSION['configuration']['Servers']) == 0) {
             message('notice', 'No servers defined, so none can be shown');
         } else {
-            foreach ($configuration['Servers'] as $i => $srv) {
+            foreach ($_SESSION['configuration']['Servers'] as $i => $srv) {
                 $data = array();
                 if (!empty($srv['verbose'])) {
                     $data[] = array('Verbose name', $srv['verbose']);
@@ -1521,7 +1507,7 @@ switch ($action) {
             if ($err) {
                 show_upload_form($dirs);
             } else {
-                $configuration = array_merge($configuration, $dirs);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $dirs);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1530,7 +1516,7 @@ switch ($action) {
         }
         break;
     case 'feat_upload':
-        show_upload_form($configuration);
+        show_upload_form($_SESSION['configuration']);
         break;
 
     case 'feat_security_real':
@@ -1550,7 +1536,7 @@ switch ($action) {
             if ($err) {
                 show_security_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1559,7 +1545,7 @@ switch ($action) {
         }
         break;
     case 'feat_security':
-        show_security_form($configuration);
+        show_security_form($_SESSION['configuration']);
         break;
 
     case 'feat_manual_real':
@@ -1573,7 +1559,7 @@ switch ($action) {
             if ($err) {
                 show_manual_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1582,7 +1568,7 @@ switch ($action) {
         }
         break;
     case 'feat_manual':
-        show_manual_form($configuration);
+        show_manual_form($_SESSION['configuration']);
         break;
 
     case 'feat_charset_real':
@@ -1592,7 +1578,7 @@ switch ($action) {
             if ($err) {
                 show_charset_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1601,7 +1587,7 @@ switch ($action) {
         }
         break;
     case 'feat_charset':
-        $d = $configuration;
+        $d = $_SESSION['configuration'];
         if (!isset($d['RecodingEngine'])) {
             if (@extension_loaded('iconv')) {
                 $d['RecodingEngine']         = 'iconv';
@@ -1635,7 +1621,7 @@ switch ($action) {
             if ($err) {
                 show_extensions_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1644,7 +1630,7 @@ switch ($action) {
         }
         break;
     case 'feat_extensions':
-        $d = $configuration;
+        $d = $_SESSION['configuration'];
         if (!@extension_loaded('mbstring')) {
             PMA_dl('mbstring');
         }
@@ -1675,7 +1661,7 @@ switch ($action) {
             if ($err) {
                 show_relation_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1684,7 +1670,7 @@ switch ($action) {
         }
         break;
     case 'feat_relation':
-        show_relation_form($configuration);
+        show_relation_form($_SESSION['configuration']);
         break;
 
     case 'lay_navigation_real':
@@ -1705,7 +1691,7 @@ switch ($action) {
             if ($err) {
                 show_left_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1714,7 +1700,7 @@ switch ($action) {
         }
         break;
     case 'lay_navigation':
-        show_left_form($configuration);
+        show_left_form($_SESSION['configuration']);
         break;
 
     case 'lay_tabs_real':
@@ -1724,7 +1710,7 @@ switch ($action) {
             if ($err) {
                 show_tabs_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1733,7 +1719,7 @@ switch ($action) {
         }
         break;
     case 'lay_tabs':
-        show_tabs_form($configuration);
+        show_tabs_form($_SESSION['configuration']);
         break;
 
     case 'lay_icons_real':
@@ -1743,7 +1729,7 @@ switch ($action) {
             if ($err) {
                 show_icons_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1752,7 +1738,7 @@ switch ($action) {
         }
         break;
     case 'lay_icons':
-        show_icons_form($configuration);
+        show_icons_form($_SESSION['configuration']);
         break;
 
     case 'lay_browse_real':
@@ -1770,7 +1756,7 @@ switch ($action) {
             if ($err) {
                 show_browse_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1779,7 +1765,7 @@ switch ($action) {
         }
         break;
     case 'lay_browse':
-        show_browse_form($configuration);
+        show_browse_form($_SESSION['configuration']);
         break;
 
     case 'lay_edit_real':
@@ -1809,7 +1795,7 @@ switch ($action) {
             if ($err) {
                 show_edit_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1818,7 +1804,7 @@ switch ($action) {
         }
         break;
     case 'lay_edit':
-        show_edit_form($configuration);
+        show_edit_form($_SESSION['configuration']);
         break;
 
     case 'lay_window_real':
@@ -1836,7 +1822,7 @@ switch ($action) {
             if ($err) {
                 show_window_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1845,7 +1831,7 @@ switch ($action) {
         }
         break;
     case 'lay_window':
-        show_window_form($configuration);
+        show_window_form($_SESSION['configuration']);
         break;
 
 /* Template for new actions:
@@ -1860,7 +1846,7 @@ switch ($action) {
             if ($err) {
                 show_blah_form($vals);
             } else {
-                $configuration = array_merge($configuration, $vals);
+                $_SESSION['configuration'] = array_merge($_SESSION['configuration'], $vals);
                 message('notice', 'Configuration changed');
                 $show_info = TRUE;
             }
@@ -1869,7 +1855,7 @@ switch ($action) {
         }
         break;
     case 'blah':
-        show_blah_form($configuration);
+        show_blah_form($_SESSION['configuration']);
         break;
 */
     case 'versioncheck': // Check for latest available version
@@ -1931,7 +1917,7 @@ switch ($action) {
         break;
 
     case 'seteol':
-        $eoltype = $_POST['neweol'];
+        $_SESSION['eoltype'] = $_POST['neweol'];
         message('notice', 'End of line format changed.');
     case 'clear': // Actual clearing is done on beginning of this script
     case 'main':
@@ -1967,14 +1953,14 @@ switch ($action) {
 if ($show_info) {
     $servers = 'none';
     $servers_text = 'Servers';
-    if (count($configuration['Servers']) == 0) {
+    if (count($_SESSION['configuration']['Servers']) == 0) {
         message('warning', 'No servers defined, you probably want to add one.');
     } else {
         $servers = '';
-        $servers_text = 'Servers (' . count($configuration['Servers']) . ')';
+        $servers_text = 'Servers (' . count($_SESSION['configuration']['Servers']) . ')';
 
         $sep = '';
-        foreach ($configuration['Servers'] as $key => $val) {
+        foreach ($_SESSION['configuration']['Servers'] as $key => $val) {
             $servers .= $sep;
             $sep = ', ';
             $servers .= get_server_name($val, $key);
@@ -1984,9 +1970,9 @@ if ($show_info) {
     show_overview('Current configuration overview',
         array(
             array($servers_text, $servers),
-            array('SQL files upload', empty($configuration['UploadDir']) ? 'disabled' : 'enabled'),
-            array('Exported files on server', empty($configuration['SaveDir']) ? 'disabled' : 'enabled'),
-            array('Charset conversion', isset($configuration['AllowAnywhereRecoding']) && $configuration['AllowAnywhereRecoding'] ? 'enabled' : 'disabled'),
+            array('SQL files upload', empty($_SESSION['configuration']['UploadDir']) ? 'disabled' : 'enabled'),
+            array('Exported files on server', empty($_SESSION['configuration']['SaveDir']) ? 'disabled' : 'enabled'),
+            array('Charset conversion', isset($_SESSION['configuration']['AllowAnywhereRecoding']) && $_SESSION['configuration']['AllowAnywhereRecoding'] ? 'enabled' : 'disabled'),
         ));
     unset($servers_text, $servers);
 }
@@ -1996,7 +1982,7 @@ echo '<p>Available global actions (pleas
 
 echo '<fieldset class="toolbar"><legend>Servers</legend>' . "\n";
 echo get_action('addserver', 'Add');
-$servers = get_server_selection($configuration);
+$servers = get_server_selection($_SESSION['configuration']);
 if (!empty($servers)) {
     echo get_action('servers', 'List');
     echo get_action('deleteserver', 'Delete', $servers);
@@ -2031,9 +2017,9 @@ echo get_action('load', 'Load', '', !$fa
 echo get_action('clear', 'Clear');
 echo get_action('seteol', 'Change end of line',
         '<select name="neweol">' .
-        '<option value="unix" ' . ($eoltype == 'unix' ? ' selected="selected"' : '') . '>UNIX/Linux (\\n)</option>' .
-        '<option value="dos" ' . ($eoltype == 'dos' ? ' selected="selected"' : '') . '>DOS/Windows (\\r\\n)</option>' .
-        '<option value="mac" ' . ($eoltype == 'mac' ? ' selected="selected"' : '') . '>Macintosh (\\r)</option>' . '
+        '<option value="unix" ' . ($_SESSION['eoltype'] == 'unix' ? ' selected="selected"' : '') . '>UNIX/Linux (\\n)</option>' .
+        '<option value="dos" ' . ($_SESSION['eoltype'] == 'dos' ? ' selected="selected"' : '') . '>DOS/Windows (\\r\\n)</option>' .
+        '<option value="mac" ' . ($_SESSION['eoltype'] == 'mac' ? ' selected="selected"' : '') . '>Macintosh (\\r)</option>' . '
         </select>');
 echo '</fieldset>' . "\n\n";
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/signon.php phpMyAdmin-2.11.10.1-all-languages/scripts/signon.php
--- phpMyAdmin-2.11.9.6-all-languages/scripts/signon.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/signon.php	2010-08-20 13:47:14.000000000 +0700
@@ -7,7 +7,7 @@
  * not intended to be perfect code and look, only shows how you can
  * integrate this functionality in your application.
  *
- * @version $Id: signon.php 11204 2008-04-21 17:06:03Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin
  * @subpacke Example
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/upgrade.pl phpMyAdmin-2.11.10.1-all-languages/scripts/upgrade.pl
--- phpMyAdmin-2.11.9.6-all-languages/scripts/upgrade.pl	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/upgrade.pl	2010-08-20 13:47:14.000000000 +0700
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: upgrade.pl 9743 2006-11-19 13:10:31Z lem9 $
+# $Id$
 #
 # upgrade.pl - automatic phpmyadmin upgrader
 #
diff -rupN phpMyAdmin-2.11.9.6-all-languages/scripts/upgrade_tables_mysql_4_1_2+.sql phpMyAdmin-2.11.10.1-all-languages/scripts/upgrade_tables_mysql_4_1_2+.sql
--- phpMyAdmin-2.11.9.6-all-languages/scripts/upgrade_tables_mysql_4_1_2+.sql	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/scripts/upgrade_tables_mysql_4_1_2+.sql	2010-08-20 13:47:14.000000000 +0700
@@ -10,7 +10,7 @@
 --
 -- Please don't forget to set up the tablenames in config.inc.php
 --
--- $Id: upgrade_tables_mysql_4_1_2+.sql 10212 2007-03-27 13:53:14Z cybot_tm $
+-- $Id$
 
 -- --------------------------------------------------------
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_binlog.php phpMyAdmin-2.11.10.1-all-languages/server_binlog.php
--- phpMyAdmin-2.11.9.6-all-languages/server_binlog.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_binlog.php	2010-08-20 13:47:14.000000000 +0700
@@ -36,7 +36,7 @@
  * @uses    array_key_exists()
  * @uses    implode()
  * @uses    htmlspecialchars()
- * @version $Id: server_binlog.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_collations.php phpMyAdmin-2.11.10.1-all-languages/server_collations.php
--- phpMyAdmin-2.11.9.6-all-languages/server_collations.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_collations.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_collations.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_databases.php phpMyAdmin-2.11.10.1-all-languages/server_databases.php
--- phpMyAdmin-2.11.9.6-all-languages/server_databases.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_databases.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_databases.php 10462 2007-06-25 14:00:35Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -287,11 +287,11 @@ if ($databases_count > 0) {
     unset($column_order, $stat_name, $stat, $databases, $table_columns);
 
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
-        $common_url_query = PMA_generate_common_url() . '&amp;sort_by=' . $sort_by . '&amp;sort_order=' . $sort_order . '&amp;dbstats=' . $dbstats;
+        $common_url_query = PMA_generate_common_url(array('sort_by' => $sort_by, 'sort_order' => $sort_order, 'dbstats' => $dbstats));
         echo '<img class="selectallarrow" src="' . $pmaThemeImage . 'arrow_' . $text_dir . '.png" width="38" height="22" alt="' . $strWithChecked . '" />' . "\n"
-           . '<a href="./server_databases.php?' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
+           . '<a href="./server_databases.php' . $common_url_query . '&amp;checkall=1" onclick="if (markAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . $strCheckAll . '</a> / ' . "\n"
-           . '<a href="./server_databases.php?' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
+           . '<a href="./server_databases.php' . $common_url_query . '" onclick="if (unMarkAllRows(\'tabledatabases\')) return false;">' . "\n"
            . '    ' . $strUncheckAll . '</a>' . "\n"
            . '<i>' . $strWithChecked . '</i>' . "\n";
         PMA_buttonOrImage('drop_selected_dbs', 'mult_submit', 'drop_selected_dbs', $strDrop, 'b_deltbl.png');
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_engines.php phpMyAdmin-2.11.10.1-all-languages/server_engines.php
--- phpMyAdmin-2.11.9.6-all-languages/server_engines.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_engines.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * display list of server enignes and additonal information about them
  *
- * @version $Id: server_engines.php 10358 2007-05-09 10:55:52Z cybot_tm $
+ * @version $Id$
  * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/
  */
 
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_export.php phpMyAdmin-2.11.10.1-all-languages/server_export.php
--- phpMyAdmin-2.11.9.6-all-languages/server_export.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_export.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_export.php 10517 2007-07-22 17:07:18Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_import.php phpMyAdmin-2.11.10.1-all-languages/server_import.php
--- phpMyAdmin-2.11.9.6-all-languages/server_import.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_import.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_privileges.php phpMyAdmin-2.11.10.1-all-languages/server_privileges.php
--- phpMyAdmin-2.11.9.6-all-languages/server_privileges.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_privileges.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_privileges.php 10908 2007-11-09 07:41:47Z cybot_tm $
+ * @version $Id$
  */
 
 /**
@@ -602,7 +602,7 @@ function PMA_displayLoginInformationFiel
        . $spaces . '        <option value="userdefined"' . ((!isset($GLOBALS['pred_username']) || $GLOBALS['pred_username'] == 'userdefined') ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
        . $spaces . '    </select>' . "\n"
        . $spaces . '</span>' . "\n"
-       . $spaces . '<input type="text" name="username" maxlength="' . $username_length . '" title="' . $GLOBALS['strUserName'] . '"' . (empty($GLOBALS['username']) ? '' : ' value="' . (isset($GLOBALS['new_username']) ? $GLOBALS['new_username'] : $GLOBALS['username']) . '"') . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
+       . $spaces . '<input type="text" name="username" maxlength="' . $username_length . '" title="' . $GLOBALS['strUserName'] . '"' . (empty($GLOBALS['username']) ? '' : ' value="' . htmlspecialchars(isset($GLOBALS['new_username']) ? $GLOBALS['new_username'] : $GLOBALS['username']) . '"') . ' onchange="pred_username.value = \'userdefined\';" />' . "\n"
        . $spaces . '</div>' . "\n"
        . $spaces . '<div class="item">' . "\n"
        . $spaces . '<label for="select_pred_hostname">' . "\n"
@@ -650,7 +650,7 @@ function PMA_displayLoginInformationFiel
        . $spaces . '        <option value="userdefined"' . ((isset($GLOBALS['pred_hostname']) && $GLOBALS['pred_hostname'] == 'userdefined') ? ' selected="selected"' : '') . '>' . $GLOBALS['strUseTextField'] . ':</option>' . "\n"
        . $spaces . '    </select>' . "\n"
        . $spaces . '</span>' . "\n"
-       . $spaces . '<input type="text" name="hostname" maxlength="' . $hostname_length . '" value="' . (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '') . '" title="' . $GLOBALS['strHost'] . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
+       . $spaces . '<input type="text" name="hostname" maxlength="' . $hostname_length . '" value="' . htmlspecialchars(isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '') . '" title="' . $GLOBALS['strHost'] . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n"
        . $spaces . '</div>' . "\n"
        . $spaces . '<div class="item">' . "\n"
        . $spaces . '<label for="select_pred_password">' . "\n"
@@ -757,14 +757,14 @@ if (!empty($adduser_submit) || !empty($c
 
     if (PMA_DBI_num_rows($res) == 1) {
         PMA_DBI_free_result($res);
-        $message = sprintf($GLOBALS['strUserAlreadyExists'], '[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
+        $message = sprintf($GLOBALS['strUserAlreadyExists'], '[i]\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'[/i]');
         $adduser = 1;
     } else {
         PMA_DBI_free_result($res);
 
         if (50002 <= PMA_MYSQL_INT_VERSION) {
             // MySQL 5 requires CREATE USER before any GRANT on this user can done
-            $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\'';
+            $create_user_real = 'CREATE USER \'' . PMA_sqlAddslashes($username) . '\'@\'' . htmlspecialchars($hostname) . '\'';
         }
 
         $real_sql_query =
@@ -1048,7 +1048,7 @@ if (!empty($update_privs)) {
     $sql_query = (isset($sql_query0) ? $sql_query0 . ' ' : '')
                . (isset($sql_query1) ? $sql_query1 . ' ' : '')
                . $sql_query2;
-    $message = sprintf($GLOBALS['strUpdatePrivMessage'], '\'' . $username . '\'@\'' . $hostname . '\'');
+    $message = sprintf($GLOBALS['strUpdatePrivMessage'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
 }
 
 
@@ -1080,7 +1080,7 @@ if (!empty($revokeall)) {
         unset($sql_query1);
     }
     $sql_query = $sql_query0 . (isset($sql_query1) ? ' ' . $sql_query1 : '');
-    $message = sprintf($GLOBALS['strRevokeMessage'], '\'' . $username . '\'@\'' . $hostname . '\'');
+    $message = sprintf($GLOBALS['strRevokeMessage'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
     if (! isset($tablename) || ! strlen($tablename)) {
         unset($dbname);
     } else {
@@ -1115,7 +1115,7 @@ if (!empty($change_pw)) {
         $sql_query        = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . preg_replace('@.@s', '*', $pma_pw) . '\')');
         $local_query      = 'SET PASSWORD FOR \'' . PMA_sqlAddslashes($username) . '\'@\'' . $hostname . '\' = ' . (($pma_pw == '') ? '\'\'' : $hashing_function . '(\'' . PMA_sqlAddslashes($pma_pw) . '\')');
         PMA_DBI_try_query($local_query) or PMA_mysqlDie(PMA_DBI_getError(), $sql_query, FALSE, $err_url);
-        $message = sprintf($GLOBALS['strPasswordChanged'], '\'' . $username . '\'@\'' . $hostname . '\'');
+        $message = sprintf($GLOBALS['strPasswordChanged'], '\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'');
     }
 }
 
@@ -1588,17 +1588,17 @@ if (empty($adduser) && (! isset($checkpr
 
         echo '<h2>' . "\n"
            . ($GLOBALS['cfg']['PropertiesIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_usredit.png" width="16" height="16" alt="" />' : '')
-           . $GLOBALS['strUser'] . ' <i><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;username=' . urlencode($username) . '&amp;hostname=' . urlencode($hostname) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
+           . $GLOBALS['strUser'] . ' <i><a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;username=' . htmlspecialchars(urlencode($username)) . '&amp;hostname=' . htmlspecialchars(urlencode($hostname)) . '">\'' . htmlspecialchars($username) . '\'@\'' . htmlspecialchars($hostname) . '\'</a></i>' . "\n";
         if (isset($dbname) && strlen($dbname)) {
             if ($dbname_is_wildcard) {
             echo '    - ' . $GLOBALS['strDatabases'];
             } else {
             echo '    - ' . $GLOBALS['strDatabase'];
             }
-            $url_dbname = urlencode(str_replace('\_', '_', $dbname));
+            $url_dbname = htmlspecialchars(urlencode(str_replace('\_', '_', $dbname)));
             echo ' <i><a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;reload=1">' . htmlspecialchars($dbname) . '</a></i>' . "\n";
             if (isset($tablename) && strlen($tablename)) {
-                echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;table=' . urlencode($tablename) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
+                echo '    - ' . $GLOBALS['strTable'] . ' <i><a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . $GLOBALS['url_query'] . '&amp;db=' . $url_dbname . '&amp;table=' . htmlspecialchars(urlencode($tablename)) . '&amp;reload=1">' . htmlspecialchars($tablename) . '</a></i>' . "\n";
             }
             unset($url_dbname);
         }
@@ -1839,16 +1839,16 @@ if (empty($adduser) && (! isset($checkpr
                     }
                     echo '</td>' . "\n"
                        . '    <td>';
-                    printf($link_edit, urlencode($username),
-                        urlencode($hostname),
-                        urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname),
+                    printf($link_edit, htmlspecialchars(urlencode($username)),
+                        htmlspecialchars(urlencode($hostname)),
+                        htmlspecialchars(urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname)),
                         urlencode((! isset($dbname) || ! strlen($dbname)) ? '' : $row['Table_name']));
                     echo '</td>' . "\n"
                        . '    <td>';
                     if (! empty($row['can_delete']) || isset($row['Table_name']) && strlen($row['Table_name'])) {
-                        printf($link_revoke, urlencode($username),
-                            urlencode($hostname),
-                            urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname),
+                        printf($link_revoke, htmlspecialchars(urlencode($username)),
+                            htmlspecialchars(urlencode($hostname)),
+                            htmlspecialchars(urlencode((! isset($dbname) || ! strlen($dbname)) ? $row['Db'] : $dbname)),
                             urlencode((! isset($dbname) || ! strlen($dbname)) ? '' : $row['Table_name']));
                     }
                     echo '</td>' . "\n"
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_processlist.php phpMyAdmin-2.11.10.1-all-languages/server_processlist.php
--- phpMyAdmin-2.11.9.6-all-languages/server_processlist.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_processlist.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_processlist.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_sql.php phpMyAdmin-2.11.10.1-all-languages/server_sql.php
--- phpMyAdmin-2.11.9.6-all-languages/server_sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_sql.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_status.php phpMyAdmin-2.11.10.1-all-languages/server_status.php
--- phpMyAdmin-2.11.9.6-all-languages/server_status.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_status.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * displays status variables with descriptions and some hints an optmizing
  *  + reset status variables
  *
- * @version $Id: server_status.php 10871 2007-10-22 12:15:53Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/server_variables.php phpMyAdmin-2.11.10.1-all-languages/server_variables.php
--- phpMyAdmin-2.11.9.6-all-languages/server_variables.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/server_variables.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: server_variables.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/show_config_errors.php phpMyAdmin-2.11.10.1-all-languages/show_config_errors.php
--- phpMyAdmin-2.11.9.6-all-languages/show_config_errors.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/show_config_errors.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Simple wrapper just to enable error reporting and include config
  *
- * @version $Id: show_config_errors.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/sql.php phpMyAdmin-2.11.10.1-all-languages/sql.php
--- phpMyAdmin-2.11.9.6-all-languages/sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * @todo    we must handle the case if sql.php is called directly with a query
  *          what returns 0 rows - to prevent cyclic redirects or includes
- * @version $Id: sql.php 11163 2008-03-16 11:28:18Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -175,14 +175,14 @@ if ($do_confirm) {
         .PMA_generate_common_hidden_inputs($db, $table);
     ?>
     <input type="hidden" name="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" />
-    <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows) : ''; ?>" />
+    <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows, true) : ''; ?>" />
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
-    <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back) : ''; ?>" />
-    <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload) : 0; ?>" />
-    <input type="hidden" name="purge" value="<?php echo isset($purge) ? PMA_sanitize($purge) : ''; ?>" />
-    <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? PMA_sanitize($cpurge) : ''; ?>" />
-    <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? PMA_sanitize($purgekey) : ''; ?>" />
-    <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? PMA_sanitize($show_query) : ''; ?>" />
+    <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back, true) : ''; ?>" />
+    <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload, true) : 0; ?>" />
+    <input type="hidden" name="purge" value="<?php echo isset($purge) ? PMA_sanitize($purge, true) : ''; ?>" />
+    <input type="hidden" name="cpurge" value="<?php echo isset($cpurge) ? PMA_sanitize($cpurge, true) : ''; ?>" />
+    <input type="hidden" name="purgekey" value="<?php echo isset($purgekey) ? PMA_sanitize($purgekey, true) : ''; ?>" />
+    <input type="hidden" name="show_query" value="<?php echo isset($show_query) ? PMA_sanitize($show_query, true) : ''; ?>" />
     <?php
     echo '<fieldset class="confirmation">' . "\n"
         .'    <legend>' . $strDoYouReally . '</legend>'
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_addfield.php phpMyAdmin-2.11.10.1-all-languages/tbl_addfield.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_addfield.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_addfield.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_addfield.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_alter.php phpMyAdmin-2.11.10.1-all-languages/tbl_alter.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_alter.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_alter.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_alter.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_change.php phpMyAdmin-2.11.10.1-all-languages/tbl_change.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_change.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_change.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_change.php 11337 2008-06-23 11:56:41Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_create.php phpMyAdmin-2.11.10.1-all-languages/tbl_create.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_create.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_create.php	2010-08-20 13:47:14.000000000 +0700
@@ -34,7 +34,7 @@
  * @uses    strlen()
  * @uses    sprintf()
  * @uses    htmlspecialchars()
- * @version $Id: tbl_create.php 10633 2007-09-13 00:06:29Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_export.php phpMyAdmin-2.11.10.1-all-languages/tbl_export.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_export.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_export.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_export.php 11061 2008-01-18 18:29:17Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_import.php phpMyAdmin-2.11.10.1-all-languages/tbl_import.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_import.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_import.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_import.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_indexes.php phpMyAdmin-2.11.10.1-all-languages/tbl_indexes.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_indexes.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_indexes.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * display information about indexes in a table
  *
- * @version $Id: tbl_indexes.php 11058 2008-01-17 17:50:31Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_move_copy.php phpMyAdmin-2.11.10.1-all-languages/tbl_move_copy.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_move_copy.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_move_copy.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_move_copy.php 11027 2007-12-30 20:59:57Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_operations.php phpMyAdmin-2.11.10.1-all-languages/tbl_operations.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_operations.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_operations.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_operations.php 11027 2007-12-30 20:59:57Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_printview.php phpMyAdmin-2.11.10.1-all-languages/tbl_printview.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_printview.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_printview.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_printview.php 11228 2008-05-03 11:59:52Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_relation.php phpMyAdmin-2.11.10.1-all-languages/tbl_relation.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_relation.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_relation.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_relation.php 11366 2008-07-04 14:36:18Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_replace.php phpMyAdmin-2.11.10.1-all-languages/tbl_replace.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_replace.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_replace.php	2010-08-20 13:47:14.000000000 +0700
@@ -5,7 +5,7 @@
  *
  * usally called as form action from tbl_change.php to insert or update table rows
  *
- * @version $Id: tbl_replace.php 11281 2008-05-18 15:53:27Z lem9 $
+ * @version $Id$
  *
  * @todo 'edit_next' tends to not work as expected if used ... at least there is no order by
  *       it needs the original query and the row number and than replace the LIMIT clause
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_row_action.php phpMyAdmin-2.11.10.1-all-languages/tbl_row_action.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_row_action.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_row_action.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_row_action.php 10398 2007-05-15 11:16:10Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_select.php phpMyAdmin-2.11.10.1-all-languages/tbl_select.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_select.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_select.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_select.php 10241 2007-04-01 11:13:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_sql.php phpMyAdmin-2.11.10.1-all-languages/tbl_sql.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_sql.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_sql.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_sql.php 10965 2007-12-05 17:53:52Z lem9 $
+ * @version $Id$
  */
 
 /**
@@ -37,7 +37,7 @@ require_once './libraries/tbl_links.inc.
 /**
  * Query box, bookmark, insert data from textfile
  */
-PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';');
+PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? htmlspecialchars($_REQUEST['delimiter']) : ';');
 
 /**
  * Displays the footer
diff -rupN phpMyAdmin-2.11.9.6-all-languages/tbl_structure.php phpMyAdmin-2.11.10.1-all-languages/tbl_structure.php
--- phpMyAdmin-2.11.9.6-all-languages/tbl_structure.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/tbl_structure.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: tbl_structure.php 11354 2008-06-27 15:08:21Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/AllTests.php phpMyAdmin-2.11.10.1-all-languages/test/AllTests.php
--- phpMyAdmin-2.11.9.6-all-languages/test/AllTests.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/AllTests.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,67 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * runs all defined tests
- *
- * @version $Id: AllTests.php 10291 2007-04-17 10:21:51Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-if (! defined('PMA_MAIN_METHOD')) {
-    define('PMA_MAIN_METHOD', 'AllTests::main');
-    chdir('..');
-}
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once 'PHPUnit/TextUI/TestRunner.php';
-//require_once 'PHPUnit/Util/TestDox/ResultPrinter.php.';
-require_once './test/FailTest.php';
-require_once './test/PMA_get_real_size_test.php';
-require_once './test/PMA_sanitize_test.php';
-require_once './test/PMA_pow_test.php';
-require_once './test/Environment_test.php';
-require_once './test/PMA_escapeJsString_test.php';
-require_once './test/PMA_isValid_test.php';
-require_once './test/PMA_transformation_getOptions_test.php';
-require_once './test/PMA_STR_sub_test.php';
-
-class AllTests
-{
-    public static function main()
-    {
-        $parameters = array();
-        //$parameters['testdoxHTMLFile'] = true;
-        //$parameters['printer'] = PHPUnit_Util_TestDox_ResultPrinter::factory('HTML');
-        //$parameters['printer'] = PHPUnit_Util_TestDox_ResultPrinter::factory('Text');
-        PHPUnit_TextUI_TestRunner::run(self::suite(), $parameters);
-    }
-
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('phpMyAdmin');
-
-        //$suite->addTestSuite('FailTest');
-        $suite->addTestSuite('Environment_test');
-        $suite->addTestSuite('PMA_get_real_size_test');
-        $suite->addTestSuite('PMA_sanitize_test');
-        $suite->addTestSuite('PMA_pow_test');
-        $suite->addTestSuite('PMA_escapeJsString_test');
-        $suite->addTestSuite('PMA_isValid_test');
-        $suite->addTestSuite('PMA_transformation_getOptions_test');
-        $suite->addTestSuite('PMA_STR_sub_test');
-        return $suite;
-    }
-}
-
-if (PMA_MAIN_METHOD == 'AllTests::main') {
-    echo '<pre>';
-    AllTests::main();
-    echo '</pre>';
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/Environment_test.php phpMyAdmin-2.11.10.1-all-languages/test/Environment_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/Environment_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/Environment_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,33 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for environment like OS, PHP, modules, ...
- *
- * @version $Id: Environment_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-
-class Environment_test extends PHPUnit_Framework_TestCase
-{
-    public function testPhpVersion()
-    {
-        $this->assertTrue(version_compare('4.1', phpversion(), '<='),
-            'phpMyAdmin requires PHP 4.1 or above');
-    }
-
-    public function testMySQL()
-    {
-        $this->markTestIncomplete();
-    }
-
-    public function testSession()
-    {
-        $this->markTestIncomplete();
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/FailTest.php phpMyAdmin-2.11.10.1-all-languages/test/FailTest.php
--- phpMyAdmin-2.11.9.6-all-languages/test/FailTest.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/FailTest.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,22 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_get_real_size()
- *
- * @version $Id: FailTest.php 10146 2007-03-20 14:16:18Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-
-class FailTest extends PHPUnit_Framework_TestCase
-{
-    public function testFail()
-    {
-        $this->assertEquals(0, 1);
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_escapeJsString_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_escapeJsString_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_escapeJsString_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_escapeJsString_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,58 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * Test for javascript escaping.
- *
- * @author Michal Čihař <michal@cihar.com>
- * @package phpMyAdmin-test
- * @version $Id: PMA_escapeJsString_test.php 10237 2007-04-01 08:23:23Z cybot_tm $
- */
-
-/**
- * Tests core.
- */
-require_once 'PHPUnit/Framework.php';
-
-/**
- * Include to test.
- */
-require_once './libraries/js_escape.lib.php';
-
-/**
- * Test java script escaping.
- *
- */
-class PMA_escapeJsString_test extends PHPUnit_Framework_TestCase
-{
-    public function testEscape_1()
-    {
-        $this->assertEquals('\\\';', PMA_escapeJsString('\';'));
-    }
-
-    public function testEscape_2()
-    {
-        $this->assertEquals('\r\n\\\'<scrIpt></\' + \'script>', PMA_escapeJsString("\r\n'<scrIpt></sCRIPT>"));
-    }
-
-    public function testEscape_3()
-    {
-        $this->assertEquals('\\\';[XSS]', PMA_escapeJsString('\';[XSS]'));
-    }
-
-    public function testEscape_4()
-    {
-        $this->assertEquals('</\' + \'script></head><body>[HTML]', PMA_escapeJsString('</SCRIPT></head><body>[HTML]'));
-    }
-
-    public function testEscape_5()
-    {
-        $this->assertEquals('"\\\'\\\\\\\'"', PMA_escapeJsString('"\'\\\'"'));
-    }
-
-    public function testEscape_6()
-    {
-        $this->assertEquals("\\\\\'\'\'\'\'\'\'\'\'\'\'\'\\\\", PMA_escapeJsString("\\''''''''''''\\"));
-    }
-
-}
-?>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_get_real_size_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_get_real_size_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_get_real_size_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_get_real_size_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,43 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_get_real_size()
- *
- * @version $Id: PMA_get_real_size_test.php 10146 2007-03-20 14:16:18Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once './libraries/core.lib.php';
-
-class PMA_get_real_size_test extends PHPUnit_Framework_TestCase
-{
-    public function testNull()
-    {
-        $this->assertEquals(0, PMA_get_real_size('0'));
-    }
-
-    public function testKilobyte()
-    {
-        $this->assertEquals(1024, PMA_get_real_size('1kb'));
-    }
-
-    public function testKilobyte2()
-    {
-        $this->assertEquals(1024 * 1024, PMA_get_real_size('1024k'));
-    }
-
-    public function testMegabyte()
-    {
-        $this->assertEquals(8 * 1024 * 1024, PMA_get_real_size('8m'));
-    }
-
-    public function testGigabyte()
-    {
-        $this->assertEquals(12 * 1024 * 1024 * 1024, PMA_get_real_size('12gb'));
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_isValid_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_isValid_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_isValid_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_isValid_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,112 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_pow()
- *
- * @version $Id: PMA_pow_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once './libraries/core.lib.php';
-
-class PMA_isValid_test extends PHPUnit_Framework_TestCase
-{
-    public function testVarNotSetAfterTest()
-    {
-        PMA_isValid($var);
-        $this->assertFalse(isset($var));
-    }
-    public function testNotSet()
-    {
-        $this->assertFalse(PMA_isValid($var));
-    }
-    public function testEmptyString()
-    {
-        $var = '';
-        $this->assertFalse(PMA_isValid($var));
-    }
-    public function testNotEmptyString()
-    {
-        $var = '0';
-        $this->assertTrue(PMA_isValid($var));
-    }
-    public function testZero()
-    {
-        $var = 0;
-        $this->assertTrue(PMA_isValid($var));
-    }
-    public function testNullFail()
-    {
-        $var = null;
-        $this->assertFalse(PMA_isValid($var));
-    }
-    public function testNotSetArray()
-    {
-        $this->assertFalse(PMA_isValid($array['x']));
-    }
-    public function testScalarString()
-    {
-        $var = 'string';
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-    public function testScalarInt()
-    {
-        $var = 1;
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-    public function testScalarFloat()
-    {
-        $var = 1.1;
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-    public function testScalarBool()
-    {
-        $var = true;
-        $this->assertTrue(PMA_isValid($var, 'scalar'));
-    }
-    public function testNotScalarArray()
-    {
-        $var = array('test');
-        $this->assertFalse(PMA_isValid($var, 'scalar'));
-    }
-    public function testNotScalarNull()
-    {
-        $var = null;
-        $this->assertFalse(PMA_isValid($var, 'scalar'));
-    }
-    public function testNumericInt()
-    {
-        $var = 1;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-    public function testNumericFloat()
-    {
-        $var = 1.1;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-    public function testNumericZero()
-    {
-        $var = 0;
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-    public function testNumericString()
-    {
-        $var = '+0.1';
-        $this->assertTrue(PMA_isValid($var, 'numeric'));
-    }
-    public function testValueInArray()
-    {
-        $var = 'a';
-        $this->assertTrue(PMA_isValid($var, array('a', 'b', )));
-    }
-    public function testValueNotInArray()
-    {
-        $var = 'c';
-        $this->assertFalse(PMA_isValid($var, array('a', 'b', )));
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_pow_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_pow_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_pow_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_pow_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,80 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_pow()
- *
- * @version $Id: PMA_pow_test.php 10366 2007-05-09 13:02:40Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once './libraries/common.lib.php';
-
-class PMA_pow_test extends PHPUnit_Framework_TestCase
-{
-    public function testIntOverflow()
-    {
-        $this->assertEquals('1267650600228229401496703205376',
-            PMA_pow(2, 100));
-    }
-
-    public function testBcpow()
-    {
-        if (function_exists('bcpow')) {
-            $this->assertEquals('1267650600228229401496703205376',
-                PMA_pow(2, 100, 'bcpow'));
-        } else {
-            $this->markTestSkipped('function bcpow() does not exist');
-        }
-    }
-
-    public function testGmppow()
-    {
-        if (function_exists('gmp_pow')) {
-            $this->assertEquals('1267650600228229401496703205376',
-                PMA_pow(2, 100, 'gmp_pow'));
-        } else {
-            $this->markTestSkipped('function gmp_pow() does not exist');
-        }
-    }
-
-    public function _testNegativeExp()
-    {
-        $this->assertEquals(0.25,
-            PMA_pow(2, -2));
-    }
-
-    public function _testNegativeExpPow()
-    {
-        if (function_exists('pow')) {
-            $this->assertEquals(0.25,
-                PMA_pow(2, -2, 'pow'));
-        } else {
-            $this->markTestSkipped('function pow() does not exist');
-        }
-    }
-
-    public function _testNegativeExpBcpow()
-    {
-        if (function_exists('bcpow')) {
-            $this->assertEquals(0.25,
-                PMA_pow(2, -2, 'bcpow'));
-        } else {
-            $this->markTestSkipped('function bcpow() does not exist');
-        }
-    }
-
-    public function _testNegativeExpGmppow()
-    {
-        if (function_exists('gmp_pow')) {
-            $this->assertEquals(0.25,
-                PMA_pow(2, -2, 'gmp_pow'));
-        } else {
-            $this->markTestSkipped('function gmp_pow() does not exist');
-        }
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_sanitize_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_sanitize_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_sanitize_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_sanitize_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,42 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_sanitize()
- *
- * @version $Id: PMA_sanitize_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once './libraries/sanitizing.lib.php';
-
-class PMA_sanitize_test extends PHPUnit_Framework_TestCase
-{
-    public function testXssInHref()
-    {
-        $this->assertEquals('[a@javascript:alert(\'XSS\');@target]link</a>',
-            PMA_sanitize('[a@javascript:alert(\'XSS\');@target]link[/a]'));
-    }
-
-    public function testLink()
-    {
-        $this->assertEquals('<a href="http://www.phpmyadmin.net/" target="target">link</a>',
-            PMA_sanitize('[a@http://www.phpmyadmin.net/@target]link[/a]'));
-    }
-
-    public function testHtmlTags()
-    {
-        $this->assertEquals('&lt;div onclick=""&gt;',
-            PMA_sanitize('<div onclick="">'));
-    }
-
-    public function testBbcoe()
-    {
-        $this->assertEquals('<strong>strong</strong>',
-            PMA_sanitize('[b]strong[/b]'));
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_STR_sub_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_STR_sub_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_STR_sub_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_STR_sub_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,43 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_pow()
- *
- * @version $Id: PMA_pow_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-
-$match = array();
-preg_match('@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@',
-        phpversion(), $match);
-if (isset($match) && ! empty($match[1])) {
-    if (! isset($match[2])) {
-        $match[2] = 0;
-    }
-    if (! isset($match[3])) {
-        $match[3] = 0;
-    }
-    define('PMA_PHP_INT_VERSION',
-        (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
-} else {
-    define('PMA_PHP_INT_VERSION', 0);
-}
-
-$GLOBALS['charset'] = 'UTF-8';
-
-require_once './libraries/string.lib.php';
-
-class PMA_STR_sub_test extends PHPUnit_Framework_TestCase
-{
-    public function testMultiByte()
-    {
-        $this->assertEquals('čšě',
-            PMA_substr('čšěčščěš', 0, 3));
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/PMA_transformation_getOptions_test.php phpMyAdmin-2.11.10.1-all-languages/test/PMA_transformation_getOptions_test.php
--- phpMyAdmin-2.11.9.6-all-languages/test/PMA_transformation_getOptions_test.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/PMA_transformation_getOptions_test.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,48 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * tests for PMA_sanitize()
- *
- * @version $Id: PMA_sanitize_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
- * @package phpMyAdmin-test
- */
-
-/**
- *
- */
-require_once 'PHPUnit/Framework.php';
-require_once './libraries/transformations.lib.php';
-
-class PMA_transformation_getOptions_test extends PHPUnit_Framework_TestCase
-{
-    public function testDefault()
-    {
-        $this->assertEquals(array('option1 ', ' option2 '),
-            PMA_transformation_getOptions("option1 , option2 "));
-    }
-
-    public function testQuoted()
-    {
-        $this->assertEquals(array('option1', ' option2'),
-            PMA_transformation_getOptions("'option1' ,' option2' "));
-    }
-
-    public function testComma()
-    {
-        $this->assertEquals(array('2,3', ' ,, option ,,'),
-            PMA_transformation_getOptions("'2,3' ,' ,, option ,,' "));
-    }
-
-    public function testEmptyOptions()
-    {
-        $this->assertEquals(array('', '', ''),
-            PMA_transformation_getOptions("'',,"));
-    }
-
-    public function testEmpty()
-    {
-        $this->assertEquals(array(),
-            PMA_transformation_getOptions(''));
-    }
-}
-?>
\ В конце файла нет новой строки
diff -rupN phpMyAdmin-2.11.9.6-all-languages/test/theme.php phpMyAdmin-2.11.10.1-all-languages/test/theme.php
--- phpMyAdmin-2.11.9.6-all-languages/test/theme.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/test/theme.php	1970-01-01 07:00:00.000000000 +0700
@@ -1,286 +0,0 @@
-<?php
-/* vim: expandtab sw=4 ts=4 sts=4: */
-/**
- * theme test
- *
- * @uses    libraries/common.inc.php        global fnctions
- * @package phpMyAdmin-test
- * @version $Id: theme.php 10241 2007-04-01 11:13:46Z cybot_tm $
- */
-
-chdir('..');
-
-/**
- * Gets core libraries and defines some variables
- */
-require_once './libraries/common.inc.php';
-
-$lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][2];
-
-// start output
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-    xml:lang="<?php echo $lang_iso_code; ?>"
-    lang="<?php echo $lang_iso_code; ?>"
-    dir="<?php echo $GLOBALS['text_dir']; ?>">
-<head>
-    <title>phpMyAdmin <?php echo PMA_VERSION; ?> -
-        <?php echo htmlspecialchars($HTTP_HOST); ?> - Theme Test</title>
-    <meta http-equiv="Content-Type"
-        content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" />
-    <link rel="stylesheet" type="text/css"
-        href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=right&amp;nocache=<?php echo $_SESSION['PMA_Config']->getMtime(); ?>" />
-    <link rel="stylesheet" type="text/css" media="print"
-        href="../print.css" />
-    <script src="../js/functions.js" type="text/javascript"></script>
-</head>
-<body>
-<?php
-
-
-$separator = '<span class="separator">'
-    .'<img class="icon" src=../"' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png"'
-    .' width="5" height="9" alt="-" /></span>' . "\n";
-$item = '<a href="%1$s?%2$s" class="item">'
-    .' <img class="icon" src="../' . $GLOBALS['pmaThemeImage'] . '%5$s"'
-    .' width="16" height="16" alt="" /> ' . "\n"
-    .'%4$s: %3$s</a>' . "\n";
-
-echo '<div id="serverinfo">' . "\n";
-printf($item,
-        $GLOBALS['cfg']['DefaultTabServer'],
-        PMA_generate_common_url(),
-        'Server',
-        $GLOBALS['strServer'],
-        's_host.png');
-
-echo $separator;
-printf($item,
-        $GLOBALS['cfg']['DefaultTabDatabase'],
-        '',
-        'Database',
-        $GLOBALS['strDatabase'],
-        's_db.png');
-
-echo $separator;
-printf($item,
-        $GLOBALS['cfg']['DefaultTabTable'],
-        '',
-        'Table',
-        (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
-            ? $GLOBALS['strView']
-            : $GLOBALS['strTable']),
-        (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
-            ? 'b_views'
-            : 's_tbl') . '.png');
-
-echo '<span class="table_comment" id="span_table_comment">'
-    .'&quot;Table comment&quot</span>' . "\n";
-
-echo '</div>';
-
-
-/**
- * Displays tab links
- */
-$tabs = array();
-
-$tabs['databases']['icon'] = '../../../../' . $pmaThemeImage . 's_db.png';
-$tabs['databases']['link'] = 'server_databases.php';
-$tabs['databases']['text'] = $strDatabases;
-
-$tabs['sql']['icon'] = '../../../../' . $pmaThemeImage . 'b_sql.png';
-$tabs['sql']['link'] = 'server_sql.php';
-$tabs['sql']['text'] = $strSQL;
-
-$tabs['status']['icon'] = '../../../../' . $pmaThemeImage . 's_status.png';
-$tabs['status']['link'] = 'server_status.php';
-$tabs['status']['text'] = $strStatus;
-
-$tabs['vars']['icon'] = '../../../../' . $pmaThemeImage . 's_vars.png';
-$tabs['vars']['link'] = 'server_variables.php';
-$tabs['vars']['text'] = $strServerTabVariables;
-
-$tabs['charset']['icon'] = '../../../../' . $pmaThemeImage . 's_asci.png';
-$tabs['charset']['link'] = 'server_collations.php';
-$tabs['charset']['text'] = $strCharsets;
-
-$tabs['engine']['icon'] = '../../../../' . $pmaThemeImage . 'b_engine.png';
-$tabs['engine']['link'] = 'server_engines.php';
-$tabs['engine']['text'] = $strEngines;
-
-$tabs['rights']['icon'] = '../../../../' . $pmaThemeImage . 's_rights.png';
-$tabs['rights']['link'] = 'server_privileges.php';
-$tabs['rights']['text'] = $strPrivileges;
-
-$tabs['binlog']['icon'] = '../../../../' . $pmaThemeImage . 's_tbl.png';
-$tabs['binlog']['link'] = 'server_binlog.php';
-$tabs['binlog']['text'] = $strBinaryLog;
-
-$tabs['process']['icon'] = '../../../../' . $pmaThemeImage . 's_process.png';
-$tabs['process']['link'] = 'server_processlist.php';
-$tabs['process']['text'] = 'caution';
-$tabs['process']['class'] = 'caution';
-
-$tabs['export']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png';
-$tabs['export']['text'] = 'disabled';
-
-$tabs['export2']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png';
-$tabs['export2']['text'] = 'disabled caution';
-$tabs['export2']['class'] = 'caution';
-
-$tabs['import']['icon'] = '../../../../' . $pmaThemeImage . 'b_import.png';
-$tabs['import']['link'] = 'server_import.php';
-$tabs['import']['text'] = 'active';
-$tabs['import']['class'] = 'active';
-
-echo PMA_getTabs($tabs);
-unset($tabs);
-
-if (@file_exists($pmaThemeImage . 'logo_right.png')) {
-    ?>
-    <img id="pmalogoright" src="../<?php echo $pmaThemeImage; ?>logo_right.png"
-        alt="phpMyAdmin" />
-    <?php
-}
-?>
-<h1>
-<?php
-echo sprintf($strWelcome,
-    '<bdo dir="ltr" xml:lang="en">phpMyAdmin ' . PMA_VERSION . '</bdo>');
-?>
-</h1>
-
-<hr class="clearfloat" />
-
-<form method="post" action="theme.php" target="_parent">
-<fieldset>
-    <legend><?php echo $strTheme; ?></legend>
-<?php
-    echo $_SESSION['PMA_Theme_Manager']->getHtmlSelectBox(false);
-?>
-<noscript><input type="submit" value="Go" style="vertical-align: middle" /></noscript>
-</fieldset>
-</form>
-
-<hr />
-
-<h1>H1 Header</h1>
-<h2>H2 Header</h2>
-<h3>H3 Header</h3>
-<h4>H4 Header</h4>
-
-<h1 class="notice">Notice header!</h1>
-<div class="notice">
-    notice message box content!
-</div>
-<div class="notice">
-    <h1>Notice message box header!</h1>
-    notice message box content!
-</div>
-
-<h1 class="warning">Warning header!</h1>
-<div class="warning">
-    warning message box content!
-</div>
-<div class="warning">
-    <h1>Warning message box header!</h1>
-    warning message box content!
-</div>
-
-<h1 class="error">Error header!</h1>
-<div class="error">
-    error message box content!
-</div>
-<div class="error">
-    <h1>Error message box header!</h1>
-    error message box content!
-</div>
-
-<fieldset class="confirmation">
-    <legend>Confirmation fieldset</legend>
-    <tt>QUERY TO EXECUTE;</tt>
-</fieldset>
-<fieldset class="tblFooters">
-    <input type="submit" name="yes" value="YES" />
-    <input type="submit" name="no" value="NO" />
-</fieldset>
-
-<table class="data">
-    <caption>table.data caption</caption>
-    <thead>
-        <tr><th></th>
-            <th>table.data thead tr th</th>
-            <th>table.data thead tr th</th>
-            <th colspan="3">action</th>
-            <th>table.data thead tr th</th>
-        </tr>
-    </thead>
-    <tfoot>
-        <tr><th></th>
-            <th>table.data tfoot tr th</th>
-            <th class="value">table.data tfoot tr th</th>
-            <th colspan="3">action</th>
-            <th>table.data tfoot tr th</th>
-        </tr>
-    </tfoot>
-    <tbody>
-        <tr class="odd">
-            <td><input type="checkbox" id="checkbox_1" name="checkbox_1"
-                    value="1" /></td>
-            <th><label for="checkbox_1">th label</label</th>
-            <td class="value">td.value</td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td>table.data tbody tr.odd td</td>
-        </tr>
-        <tr class="even">
-            <td><input type="checkbox" id="checkbox_2" name="checkbox_2"
-                    value="1" /></td>
-            <th><label for="checkbox_2">th label</label</th>
-            <td class="value">td.value</td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td>table.data tbody tr.even td</td>
-        </tr>
-        <tr class="odd">
-            <td><input type="checkbox" id="checkbox_3" name="checkbox_3"
-                    value="1" /></td>
-            <th><label for="checkbox_3">th label</label</th>
-            <td class="value">td.value</td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td>table.data tbody tr.odd td</td>
-        </tr>
-        <tr class="even">
-            <td><input type="checkbox" id="checkbox_4" name="checkbox_4"
-                    value="1" /></td>
-            <th><label for="checkbox_4">th label</label</th>
-            <td class="value">td.value</td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
-                    width="16" height="16" alt="drop" /></td>
-            <td>table.data tbody tr.even td</td>
-        </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/css/theme_right.css.php phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/css/theme_right.css.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/css/theme_right.css.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/css/theme_right.css.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * main css file from theme Darkblue Orange
  *
- * @version $Id: theme_right.css.php 10666 2007-09-26 13:49:55Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/info.inc.php phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/info.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/info.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/info.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @version $Id: info.inc.php 10147 2007-03-20 14:54:22Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/layout.inc.php phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/layout.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/darkblue_orange/layout.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/darkblue_orange/layout.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id: layout.inc.php 11036 2008-01-05 14:30:41Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Darkblue_orange
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_left.css.php phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_left.css.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_left.css.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_left.css.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * navigation css file from theme Original
  *
- * @version $Id: theme_left.css.php 11409 2008-07-19 14:46:28Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_print.css.php phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_print.css.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_print.css.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_print.css.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * print css file from theme Original
  *
- * @version $Id: theme_print.css.php 10145 2007-03-20 13:39:12Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_right.css.php phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_right.css.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/original/css/theme_right.css.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/original/css/theme_right.css.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * main css file from theme Original
  *
- * @version $Id: theme_right.css.php 11126 2008-02-15 21:17:17Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/original/info.inc.php phpMyAdmin-2.11.10.1-all-languages/themes/original/info.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/original/info.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/original/info.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -3,7 +3,7 @@
 /**
  * Theme information
  *
- * @version $Id: info.inc.php 10145 2007-03-20 13:39:12Z cybot_tm $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes/original/layout.inc.php phpMyAdmin-2.11.10.1-all-languages/themes/original/layout.inc.php
--- phpMyAdmin-2.11.9.6-all-languages/themes/original/layout.inc.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes/original/layout.inc.php	2010-08-20 13:47:14.000000000 +0700
@@ -4,7 +4,7 @@
  * configures general layout
  * for detailed layout configuration please refer to the css files
  *
- * @version $Id: layout.inc.php 10515 2007-07-22 16:22:54Z lem9 $
+ * @version $Id$
  * @package phpMyAdmin-theme
  * @subpackage Original
  */
diff -rupN phpMyAdmin-2.11.9.6-all-languages/themes.php phpMyAdmin-2.11.10.1-all-languages/themes.php
--- phpMyAdmin-2.11.9.6-all-languages/themes.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/themes.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: themes.php 10239 2007-04-01 09:51:41Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/TODO phpMyAdmin-2.11.10.1-all-languages/TODO
--- phpMyAdmin-2.11.9.6-all-languages/TODO	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/TODO	2010-08-20 13:47:14.000000000 +0700
@@ -1,4 +1,4 @@
-$Id: TODO 9537 2006-10-12 16:27:13Z nijel $
+$Id$
 
 phpMyAdmin - Todo
 =================
diff -rupN phpMyAdmin-2.11.9.6-all-languages/transformation_overview.php phpMyAdmin-2.11.10.1-all-languages/transformation_overview.php
--- phpMyAdmin-2.11.9.6-all-languages/transformation_overview.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/transformation_overview.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: transformation_overview.php 10146 2007-03-20 14:16:18Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/transformation_wrapper.php phpMyAdmin-2.11.10.1-all-languages/transformation_wrapper.php
--- phpMyAdmin-2.11.9.6-all-languages/transformation_wrapper.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/transformation_wrapper.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: transformation_wrapper.php 10240 2007-04-01 11:02:46Z cybot_tm $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/translators.html phpMyAdmin-2.11.10.1-all-languages/translators.html
--- phpMyAdmin-2.11.9.6-all-languages/translators.html	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/translators.html	2010-08-20 13:47:14.000000000 +0700
@@ -2,13 +2,13 @@
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-<!-- $Id: translators.html 13041 2009-10-12 22:27:06Z lem9 $ -->
+<!-- $Id$ -->
 
 <head>
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-    <title>phpMyAdmin 2.11.9.6 - Official translators</title>
+    <title>phpMyAdmin 2.11.10.1 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -31,7 +31,7 @@
     <li><a href="Documentation.html#glossary">Glossary</a></li>
 </ul>
 
-<h1>phpMyAdmin 2.11.9.6 official translators list</h1>
+<h1>phpMyAdmin 2.11.10.1 official translators list</h1>
 
 <p> Here is the list of the &quot;official translators&quot; of
     phpMyAdmin.</p>
diff -rupN phpMyAdmin-2.11.9.6-all-languages/user_password.php phpMyAdmin-2.11.10.1-all-languages/user_password.php
--- phpMyAdmin-2.11.9.6-all-languages/user_password.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/user_password.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: user_password.php 10501 2007-07-18 15:32:08Z lem9 $
+ * @version $Id$
  */
 
 /**
diff -rupN phpMyAdmin-2.11.9.6-all-languages/view_create.php phpMyAdmin-2.11.10.1-all-languages/view_create.php
--- phpMyAdmin-2.11.9.6-all-languages/view_create.php	2009-10-13 05:28:01.000000000 +0700
+++ phpMyAdmin-2.11.10.1-all-languages/view_create.php	2010-08-20 13:47:14.000000000 +0700
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id: view_create.php 11343 2008-06-24 14:11:54Z lem9 $
+ * @version $Id$
  */
 
 /**
