[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 33df1f36a4cee7708bcf29f2f6ab5cd563454ce2

Michal Čihař nijel at users.sourceforge.net
Tue Aug 24 14:54:13 CEST 2010


The branch, master has been updated
       via  33df1f36a4cee7708bcf29f2f6ab5cd563454ce2 (commit)
       via  9c3a3504204a51a90958373571d1beceba8d30b5 (commit)
       via  f13f74fa51fbdc1042f03ad2f35067fb0f2cdaf6 (commit)
       via  46b3af30f02ff6a573e504e09a61424abee64836 (commit)
       via  6af2c364ddba94a65aa571dc549a9cf85ece2606 (commit)
       via  0cff7b2f36946b84b5437f5b39c4e1d34eaa9048 (commit)
       via  bef592df22131b6546652e2517c11c2343db4ed7 (commit)
       via  b5dba00f51be8c135fd57b62d76a89f0ebadcba4 (commit)
       via  3ee67d957f04012defc0ba27580762ba438ec9de (commit)
       via  a44c6f3049fba0ff22f1b054cd78dae083691409 (commit)
       via  9db4c65903baa144b1e9a16a49b336918da8ce32 (commit)
       via  c40de21ce0e2adc882e8526c64a94a9826607fa4 (commit)
       via  575386efc5d8740f9eef49513dbe59302da7f0de (commit)
       via  95d1f34bcd3de8998a2c31189ba7458d3f95b6f2 (commit)
       via  1dc0e671014d74e6b0a1613d0f9af1f487020811 (commit)
       via  4f62c651bab1803250170a54c8e984257c38f0e8 (commit)
       via  fe2582b8b13dafef18f2a1343109d2112f3ef6ce (commit)
       via  410b58035eb649187eeb7db7a4240620a9bb011e (commit)
       via  f89f4538531069a20452effded0b9af12ffd10c9 (commit)
       via  ab932f5ca57da28de28c6995ddb35971401eed59 (commit)
       via  4acaa87f6129b24b24940d759b532cd7bb6a0a5d (commit)
       via  a397d0a007c0fceed0284074bb6b0a4a25c3683d (commit)
       via  d180f952209e41ce27b3ce994f8088fb7a73fa0b (commit)
       via  e80cfeb1043b412576904b337b8900c05bc7c4fd (commit)
       via  8a03e8c86c29c784469f0bfee194f139b2eee834 (commit)
       via  f560b490490e89d8e748dda137f7d955a604ddec (commit)
       via  55c4d346d09370317877a654f2c5c164344a38d4 (commit)
       via  7323103a2ce0866d905b198b6742e85c589ef0dc (commit)
       via  5f04ee1527ac1b6a66582c479080d2212fdcbc0f (commit)
       via  45e7b5eecaa9c2ea84a2496bf45243388cde8377 (commit)
       via  e967292d4c7b5f812fa2553b08482166c5163247 (commit)
       via  007bc0b427118cc39dee54813a778bb365198657 (commit)
       via  37119d88e5b205c1650833aa6d8aadb3cbda118b (commit)
       via  c7685442beb485072fb919bbad62474ca47b123f (commit)
       via  928c265b08e05ad186db0e798ad3d7a3c61a44ca (commit)
       via  5eada311a9321ccf260e1376422a607614b5558a (commit)
       via  f9fe9ead0ff69efb6555fc4c7ef218eda04e49c3 (commit)
       via  886e94dcae085a5167ce1bd8702c588ef8b86fc3 (commit)
       via  4981fb3b0acbf7a61f2c94ea9e9b3a3b9c56aa10 (commit)
       via  aac36e53987ec6fac4784a6b5e150d500276ffcc (commit)
       via  b9ed0f81c7e3edc1ac63f52d047d340b61b1c6e4 (commit)
       via  607c75e9455f9986afa47d852768b347d8c6cfa8 (commit)
       via  de60efd16a6ee9f3b714a6e52afc921e8c81f3cc (commit)
       via  9e4e95938d64459e6e05eb0163d1237f6995b0d7 (commit)
       via  e8f51799cdd76e96a534e2c5b9fd25ce9edaf394 (commit)
      from  e6465deb7b901f7f8dcdbfd564885ffc403941ba (commit)


- Log -----------------------------------------------------------------
commit 33df1f36a4cee7708bcf29f2f6ab5cd563454ce2
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Aug 24 14:53:57 2010 +0200

    Match to current master.

commit 9c3a3504204a51a90958373571d1beceba8d30b5
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:20:19 2010 +0200

    Translation update done using Pootle.

commit f13f74fa51fbdc1042f03ad2f35067fb0f2cdaf6
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:20:17 2010 +0200

    Translation update done using Pootle.

commit 46b3af30f02ff6a573e504e09a61424abee64836
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:20:14 2010 +0200

    Translation update done using Pootle.

commit 6af2c364ddba94a65aa571dc549a9cf85ece2606
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:19:56 2010 +0200

    Translation update done using Pootle.

commit 0cff7b2f36946b84b5437f5b39c4e1d34eaa9048
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:19:34 2010 +0200

    Translation update done using Pootle.

commit bef592df22131b6546652e2517c11c2343db4ed7
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:19:32 2010 +0200

    Translation update done using Pootle.

commit b5dba00f51be8c135fd57b62d76a89f0ebadcba4
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:19:29 2010 +0200

    Translation update done using Pootle.

commit 3ee67d957f04012defc0ba27580762ba438ec9de
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:19:23 2010 +0200

    Translation update done using Pootle.

commit a44c6f3049fba0ff22f1b054cd78dae083691409
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:53 2010 +0200

    Translation update done using Pootle.

commit 9db4c65903baa144b1e9a16a49b336918da8ce32
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:49 2010 +0200

    Translation update done using Pootle.

commit c40de21ce0e2adc882e8526c64a94a9826607fa4
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:45 2010 +0200

    Translation update done using Pootle.

commit 575386efc5d8740f9eef49513dbe59302da7f0de
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:42 2010 +0200

    Translation update done using Pootle.

commit 95d1f34bcd3de8998a2c31189ba7458d3f95b6f2
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:37 2010 +0200

    Translation update done using Pootle.

commit 1dc0e671014d74e6b0a1613d0f9af1f487020811
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:32 2010 +0200

    Translation update done using Pootle.

commit 4f62c651bab1803250170a54c8e984257c38f0e8
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:30 2010 +0200

    Translation update done using Pootle.

commit fe2582b8b13dafef18f2a1343109d2112f3ef6ce
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:28 2010 +0200

    Translation update done using Pootle.

commit 410b58035eb649187eeb7db7a4240620a9bb011e
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:25 2010 +0200

    Translation update done using Pootle.

commit f89f4538531069a20452effded0b9af12ffd10c9
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:22 2010 +0200

    Translation update done using Pootle.

commit ab932f5ca57da28de28c6995ddb35971401eed59
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:18 2010 +0200

    Translation update done using Pootle.

commit 4acaa87f6129b24b24940d759b532cd7bb6a0a5d
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:14 2010 +0200

    Translation update done using Pootle.

commit a397d0a007c0fceed0284074bb6b0a4a25c3683d
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:11 2010 +0200

    Translation update done using Pootle.

commit d180f952209e41ce27b3ce994f8088fb7a73fa0b
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:08 2010 +0200

    Translation update done using Pootle.

commit e80cfeb1043b412576904b337b8900c05bc7c4fd
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:18:05 2010 +0200

    Translation update done using Pootle.

commit 8a03e8c86c29c784469f0bfee194f139b2eee834
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:17:58 2010 +0200

    Translation update done using Pootle.

commit f560b490490e89d8e748dda137f7d955a604ddec
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:15:01 2010 +0200

    Translation update done using Pootle.

commit 55c4d346d09370317877a654f2c5c164344a38d4
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:14:57 2010 +0200

    Translation update done using Pootle.

commit 7323103a2ce0866d905b198b6742e85c589ef0dc
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:14:51 2010 +0200

    Translation update done using Pootle.

commit 5f04ee1527ac1b6a66582c479080d2212fdcbc0f
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:14:13 2010 +0200

    Translation update done using Pootle.

commit 45e7b5eecaa9c2ea84a2496bf45243388cde8377
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:47 2010 +0200

    Translation update done using Pootle.

commit e967292d4c7b5f812fa2553b08482166c5163247
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:44 2010 +0200

    Translation update done using Pootle.

commit 007bc0b427118cc39dee54813a778bb365198657
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:41 2010 +0200

    Translation update done using Pootle.

commit 37119d88e5b205c1650833aa6d8aadb3cbda118b
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:38 2010 +0200

    Translation update done using Pootle.

commit c7685442beb485072fb919bbad62474ca47b123f
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:34 2010 +0200

    Translation update done using Pootle.

commit 928c265b08e05ad186db0e798ad3d7a3c61a44ca
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:31 2010 +0200

    Translation update done using Pootle.

commit 5eada311a9321ccf260e1376422a607614b5558a
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:27 2010 +0200

    Translation update done using Pootle.

commit f9fe9ead0ff69efb6555fc4c7ef218eda04e49c3
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:23 2010 +0200

    Translation update done using Pootle.

commit 886e94dcae085a5167ce1bd8702c588ef8b86fc3
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:17 2010 +0200

    Translation update done using Pootle.

commit 4981fb3b0acbf7a61f2c94ea9e9b3a3b9c56aa10
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:11 2010 +0200

    Translation update done using Pootle.

commit aac36e53987ec6fac4784a6b5e150d500276ffcc
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:07 2010 +0200

    Translation update done using Pootle.

commit b9ed0f81c7e3edc1ac63f52d047d340b61b1c6e4
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:13:00 2010 +0200

    Translation update done using Pootle.

commit 607c75e9455f9986afa47d852768b347d8c6cfa8
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:12:55 2010 +0200

    Translation update done using Pootle.

commit de60efd16a6ee9f3b714a6e52afc921e8c81f3cc
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:12:52 2010 +0200

    Translation update done using Pootle.

commit 9e4e95938d64459e6e05eb0163d1237f6995b0d7
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:12:49 2010 +0200

    Translation update done using Pootle.

commit e8f51799cdd76e96a534e2c5b9fd25ce9edaf394
Author: Robert Readman <robert_readman at hotmail.com>
Date:   Tue Aug 24 14:12:30 2010 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 output/cs/Documentation.html    |  103 +++++++++----------
 output/en_GB/Documentation.html |  103 +++++++++----------
 output/fr/Documentation.html    |  133 ++++++++++--------------
 output/it/Documentation.html    |  103 +++++++++----------
 output/ja/Documentation.html    |   87 ++++++++--------
 output/pl/Documentation.html    |  107 +++++++++-----------
 output/pt_BR/Documentation.html |  103 +++++++++----------
 output/zh_CN/Documentation.html |  101 +++++++++---------
 po/en_GB.po                     |  215 +++++++++++++++++----------------------
 9 files changed, 483 insertions(+), 572 deletions(-)

diff --git a/output/cs/Documentation.html b/output/cs/Documentation.html
index 2768ab7..d054d41 100644
--- a/output/cs/Documentation.html
+++ b/output/cs/Documentation.html
@@ -2082,13 +2082,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] pole</dt>
@@ -2177,30 +2179,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        You have to click on the 'OK'-button below the tables to save the new
-positions.  If you want to place a new element, first add it to the table of
-elements and then you can drag the new element around.<br />
-        By changing the paper size and the orientation you can change the size of
-the scratchboard as well. You can do so by just changing the dropdown field
-below, and the scratchboard will resize automatically, without interfering
-with the current placement of the elements.<br />
-        If ever an element gets out of range you can either enlarge the paper size
-or click on the 'reset' button to place all elements below each other.<br />
-        <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to get
-this control to work. The basic Drag&Drop script functionality was
-kindly borrowed from www.youngpup.net and is underlying so specific license.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2698,8 +2676,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2744,23 +2721,7 @@ enable uploads of files while being reasonably secure:</p>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> It's not really phpMyAdmin related but RedHat 7.0. You have a RedHat 7.0 and
-you updated your PHP RPM to php-4.0.4pl1-3.i386.rpm, didn't you?<br />
-    So the problem is that this package has a serious bug that was corrected
-ages ago in PHP (2001-01-28: see <a
-href="http://www.php.net/bugs.php?id=8966">PHP's bug tracking system</a> for
-more details). The problem is that the bugged package is still available
-though it was corrected (see <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat's
-BugZilla</a> for more details).<br />
-    So please download <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">the fixed
-package (4.0.4pl1-9)</a> and the problem should go away.<br />
-    And that fixes the \r\n problem with file uploads!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2793,19 +2754,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html"> reset the
 permissions</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> If PHP does not have read/write access to its <tt>upload_tmp_dir</tt>, it
-cannot access the uploaded query.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> Check the <tt>post_max_size</tt> directive from your PHP configuration file
-and try to increase it.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4486,6 +4438,35 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        You have to click on the 'OK'-button below the tables to save the new
+positions.  If you want to place a new element, first add it to the table of
+elements and then you can drag the new element around.
+    </p>
+    <p>
+        By changing the paper size and the orientation you can change the size of
+the scratchboard as well. You can do so by just changing the dropdown field
+below, and the scratchboard will resize automatically, without interfering
+with the current placement of the elements.
+    </p>
+    <p>
+        If ever an element gets out of range you can either enlarge the paper size
+or click on the 'reset' button to place all elements below each other.
+    </p>
+
 <h3 id="faqproject">Projekt phpMyAdmin</h3>
 
 <h4 id="faq7_1">
@@ -4997,6 +4978,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>podpora pro replikaci</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html
index b17d587..106d1f5 100644
--- a/output/en_GB/Documentation.html
+++ b/output/en_GB/Documentation.html
@@ -2083,13 +2083,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] array</dt>
@@ -2178,30 +2180,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilises a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        You have to click on the 'OK'-button below the tables to save the new
-positions.  If you want to place a new element, first add it to the table of
-elements and then you can drag the new element around.<br />
-        By changing the paper size and the orientation you can change the size of
-the scratchboard as well. You can do so by just changing the dropdown field
-below, and the scratchboard will resize automatically, without interfering
-with the current placement of the elements.<br />
-        If ever an element gets out of range you can either enlarge the paper size
-or click on the 'reset' button to place all elements below each other.<br />
-        <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to get
-this control to work. The basic Drag&Drop script functionality was
-kindly borrowed from www.youngpup.net and is underlying so specific license.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2700,8 +2678,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2746,23 +2723,7 @@ enable uploads of files while being reasonably secure:</p>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> It's not really phpMyAdmin related but RedHat 7.0. You have a RedHat 7.0 and
-you updated your PHP RPM to php-4.0.4pl1-3.i386.rpm, didn't you?<br />
-    So the problem is that this package has a serious bug that was corrected
-ages ago in PHP (2001-01-28: see <a
-href="http://www.php.net/bugs.php?id=8966">PHP's bug tracking system</a> for
-more details). The problem is that the bugged package is still available
-though it was corrected (see <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat's
-BugZilla</a> for more details).<br />
-    So please download <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">the fixed
-package (4.0.4pl1-9)</a> and the problem should go away.<br />
-    And that fixes the \r\n problem with file uploads!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2795,19 +2756,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html"> reset the
 permissions</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> If PHP does not have read/write access to its <tt>upload_tmp_dir</tt>, it
-cannot access the uploaded query.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> Check the <tt>post_max_size</tt> directive from your PHP configuration file
-and try to increase it.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4488,6 +4440,35 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        You have to click on the 'OK'-button below the tables to save the new
+positions.  If you want to place a new element, first add it to the table of
+elements and then you can drag the new element around.
+    </p>
+    <p>
+        By changing the paper size and the orientation you can change the size of
+the scratchboard as well. You can do so by just changing the dropdown field
+below, and the scratchboard will resize automatically, without interfering
+with the current placement of the elements.
+    </p>
+    <p>
+        If ever an element gets out of range you can either enlarge the paper size
+or click on the 'reset' button to place all elements below each other.
+    </p>
+
 <h3 id="faqproject">phpMyAdmin project</h3>
 
 <h4 id="faq7_1">
@@ -4999,6 +4980,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/fr/Documentation.html b/output/fr/Documentation.html
index feaf745..0d3f1ba 100644
--- a/output/fr/Documentation.html
+++ b/output/fr/Documentation.html
@@ -2437,13 +2437,15 @@ textes vus dans la page d'exportation, de la sorte vous pouvez facilement
 identifier ce qu'ils signifient.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] tableau</dt>
@@ -2553,40 +2555,6 @@ utilisant un <code>SELECT COUNT ... LIMIT</code>. La valeur par
 défaut de 0 passe outre tout comptage de lignes.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>booléen</dt>
-    <dd>Utilise un contrôle d'édition WYSIWYG pour placer facilement
-les éléments d'une page <abbr title="Portable Document
-Format">PDF</abbr>. En cliquant sur le bouton 'Éditeur visuel' dans
-la page sur laquelle vous éditez les coordonnées x/y de ces
-éléments, vous pouvez activer un éditeur visuel
-où tous vos éléments sont placés. En cliquant
-sur un élément, vous pouvez le déplacer dans la zone
-prédéfinie et les coordonnées x/y seront mises à
-jour dynamiquement. De même, si vous entrez directement une nouvelle
-position dans le champ de saisie, la nouvelle position dans l'éditeur
-visuel change après que vos curseurs aient quitté le champ de
-saisie.<br />
-        Vous devez cliquer sur le bouton 'OK' en-dessous des tables pour sauvegarder
-les nouvelles positions. Si vous voulez placer un nouvel
-élément, ajoutez-le d'abord à la table des
-éléments et alors vous pourrez déplacer ce nouvel
-élément.<br />
-        En changeant la taille du papier et l'orientation, vous changez
-également la taille de l'éditeur visuel. Vous pouvez le faire
-en changeant seulement le champ déroulant au-dessous, et
-l'éditeur visuel se réajustera automatiquement, sans
-interférer avec les positions des éléments en cours.<br />
-        Si un élément sortait du champ, vous pouvez soit agrandir la
-taille du papier, soit cliquer sur le bouton 'Réinitialiser les
-valeurs' pour placer tous les éléments les uns en-dessous des
-autres.<br />
-        <b>REMARQUE :</b> Vous devez utiliser un navigateur récent comme
-IE6 ou Mozilla pour que ce contrôle puisse fonctionner. La
-fonctionnalité de script Drag&Drop  a été
-empruntée à www.youngpup.net et sa licence sous-jacente si
-spécifique.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] booléen</dt>
     <dd>Trie les noms des bases de données en ordre naturel (par exemple, t1,
 t2, t10). Actuellement mis en oeuvre dans le panneau de gauche (Mode
@@ -3143,11 +3111,9 @@ href="http://bugs.php.net/bug.php?id=12061">rapport de bogue</a> de la base
 de données officielle de bogues de PHP.</p>
 
 <h4 id="faq1_5">
-    <a href="#faq1_5">1.5 J'utilise phpMyAdmin avec <abbr title="Internet
-Information Services">IIS</abbr>, et je suis confronté à des
-plantages et/ou beaucoup de messages d'erreur avec l'authentification <abbr
-title="HyperText Transfer Protocol">HTTP</abbr> ou le mode
-d'authentification avancé.</a></h4>
+    <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
+Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> Ceci est un problème connu du filtre <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> de PHP : il n'est pas
@@ -3201,30 +3167,7 @@ du serveur Apache : <tt>chown apache:apache /tmp/php</tt></li>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 J'ai des problèmes quand je transfère
-des fichiers. En général, le transfert de fichiers ne
-fonctionne pas sur mon système et les fichiers
-transférés comportent l'en-tête <tt>Content-Type:</tt>
-sur la première ligne.</a></h4>
-
-<p> Ce n'est pas vraiment phpMyAdmin qui est en cause mais plutôt RedHat
-7.0. Vous utilisez RedHat 7.0 et vous avez mis à jour votre paquetage
-RPM PHP vers php-4.0.4pl1-3.i386.rpm, n'est-ce pas ?<br />
-    Donc le problème est que ce paquetage a un sérieux bogue qui a
-été corrigé il y a pas mal de temps dans PHP
-(28-01-2001 : voir le <a
-href="http://www.php.net/bugs.php?id=8966">système Bug Tracker de
-PHP</a> pour plus de détails). Le problème est que ce
-paquetage bogué est toujours disponible bien qu'il soit
-corrigé (voir <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat's
-BugZilla</a> pour plus de détails).<br />
-    Aussi, veuillez télécharger <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">le paquetage
-corrigé (4.0.4pl1-9)</a> et le problème devrait
-disparaître.<br />
-    Et cela corrige le problème \r\n avec les transferts de
-fichiers !</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 J'ai des problèmes en transférant des
@@ -3262,22 +3205,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html">réinitiali
 les permissions</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 J'obtiens une erreur 'Aucune requête <abbr
-title="Structured Query Language">SQL</abbr> !' en exécutant un
-signet.</a></h4>
-
-<p> Si PHP n'a pas d'accès en lecture/écriture à son
-répertoire <tt>upload_tmp_dir</tt>, il ne peut pas accéder
-à la requête transférée.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 J'obtiens une erreur 'Aucune requête <abbr
-title="Structured Query Language">SQL</abbr> !' en essayant
-d'exécuter une requête depuis la zone de texte
-adéquate.</a></h4>
-
-<p> Vérifiez la directive <tt>post_max_size</tt> dans votre fichier de
-configuration PHP et essayez de l'augmenter.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -5186,6 +5117,40 @@ href="#cfg_Servers_verbose">configuration serveur</a></dd>
         <dd>Version de phpMyAdmin</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        Vous devez cliquer sur le bouton 'OK' en-dessous des tables pour sauvegarder
+les nouvelles positions. Si vous voulez placer un nouvel
+élément, ajoutez-le d'abord à la table des
+éléments et alors vous pourrez déplacer ce nouvel
+élément.
+    </p>
+    <p>
+        En changeant la taille du papier et l'orientation, vous changez
+également la taille de l'éditeur visuel. Vous pouvez le faire
+en changeant seulement le champ déroulant au-dessous, et
+l'éditeur visuel se réajustera automatiquement, sans
+interférer avec les positions des éléments en cours.
+    </p>
+    <p>
+        Si un élément sortait du champ, vous pouvez soit agrandir la
+taille du papier, soit cliquer sur le bouton 'Réinitialiser les
+valeurs' pour placer tous les éléments les uns en-dessous des
+autres.
+    </p>
+
 <h3 id="faqproject">Projet phpMyAdmin</h3>
 
 <h4 id="faq7_1">
@@ -5718,6 +5683,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Gestion de la réplication</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/it/Documentation.html b/output/it/Documentation.html
index c8546ba..dc768f7 100644
--- a/output/it/Documentation.html
+++ b/output/it/Documentation.html
@@ -2117,13 +2117,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] array</dt>
@@ -2212,30 +2214,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        You have to click on the 'OK'-button below the tables to save the new
-positions.  If you want to place a new element, first add it to the table of
-elements and then you can drag the new element around.<br />
-        By changing the paper size and the orientation you can change the size of
-the scratchboard as well. You can do so by just changing the dropdown field
-below, and the scratchboard will resize automatically, without interfering
-with the current placement of the elements.<br />
-        If ever an element gets out of range you can either enlarge the paper size
-or click on the 'reset' button to place all elements below each other.<br />
-        <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to get
-this control to work. The basic Drag&Drop script functionality was
-kindly borrowed from www.youngpup.net and is underlying so specific license.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2734,8 +2712,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2780,23 +2757,7 @@ enable uploads of files while being reasonably secure:</p>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> It's not really phpMyAdmin related but RedHat 7.0. You have a RedHat 7.0 and
-you updated your PHP RPM to php-4.0.4pl1-3.i386.rpm, didn't you?<br />
-    So the problem is that this package has a serious bug that was corrected
-ages ago in PHP (2001-01-28: see <a
-href="http://www.php.net/bugs.php?id=8966">PHP's bug tracking system</a> for
-more details). The problem is that the bugged package is still available
-though it was corrected (see <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat's
-BugZilla</a> for more details).<br />
-    So please download <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">the fixed
-package (4.0.4pl1-9)</a> and the problem should go away.<br />
-    And that fixes the \r\n problem with file uploads!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2829,19 +2790,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html"> reset the
 permissions</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> If PHP does not have read/write access to its <tt>upload_tmp_dir</tt>, it
-cannot access the uploaded query.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> Check the <tt>post_max_size</tt> directive from your PHP configuration file
-and try to increase it.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4522,6 +4474,35 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        You have to click on the 'OK'-button below the tables to save the new
+positions.  If you want to place a new element, first add it to the table of
+elements and then you can drag the new element around.
+    </p>
+    <p>
+        By changing the paper size and the orientation you can change the size of
+the scratchboard as well. You can do so by just changing the dropdown field
+below, and the scratchboard will resize automatically, without interfering
+with the current placement of the elements.
+    </p>
+    <p>
+        If ever an element gets out of range you can either enlarge the paper size
+or click on the 'reset' button to place all elements below each other.
+    </p>
+
 <h3 id="faqproject">phpMyAdmin project</h3>
 
 <h4 id="faq7_1">
@@ -5033,6 +5014,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html
index 5897ea2..c6105b2 100644
--- a/output/ja/Documentation.html
+++ b/output/ja/Documentation.html
@@ -2107,13 +2107,15 @@ reading and writing data in this directory.
         この配列はエクスポートの際のデフォルトパラメータを定義します。項目名はエクスポートページに表示されるテキストとほとんど同じですので、意味は簡単にわかるでしょう。
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] array</dt>
@@ -2198,24 +2200,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        新しい位置を保存するには、テーブルの下に「OK」ボタンをクリックする必要があります。新しい要素を配置する場合は、まず要素のテーブルに追加してください。新しい要素をドラッグできるようになります。<br />
-        用紙の大きさや向きを変えると、スクラッチボードの大きさも変わります。これは下のドロップダウンフィールドを変更するだけで行えます。スクラッチボードの大きさは自動的に変わります。要素の現在位置は変わりません。<br />
-        要素が範囲外に出てしまった場合、用紙の大きさを拡大するか、「リセット(reset)」ボタンをクリックして、すべての要素を縦一列に並べてください。<br />
-        <b>注意:</b> このコントロールは IE6 や Mozilla
-のような最近のブラウザを使わないと動作しません。ドラッグ&ドロップスクリプトの基本機能は非常に限定されたライセンスのもと、www.youngpup.net
-のご厚意でお借りしたものです。</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>データベースやテーブルの名前を自然な順番でソートします(たとえば、t1、t2、t10)。いまのところ左パネル(ライトモード)とデータベース画面のテーブル一覧に実装されています。</dd>
 
@@ -2670,8 +2654,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2715,21 +2698,7 @@ error about safe mode being in effect.</a></h4>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> 本当は phpMyAdmin 関連の問題ではなく、RedHat 7.0 の問題なのですが、お使いのシステムは RedHat 7.0 で、PHP RPM
-を php-4.0.4pl1-3.i386.rpm にアップデートしたのではありませんか?<br />
-    そうだとしたら、問題はこのパッケージが抱えている深刻なバグのせいです。このバグはずいぶん前に修正されたはずなのですが(2001-01-28:詳細については
-<a href="http://www.php.net/bugs.php?id=8966">PHP のバグ追跡システム</a>
-をご覧ください)、困ったことに、修正後もバグ入りのパッケージがまだ出回っているのです(詳細については <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat の
-BugZilla</a> をご覧ください)。<br />
-    ですから、<a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">修正済みのパッケージ(4.0.4pl1-9)</a>
-をダウンロードしていただければ問題は解決します。<br />
-    また、この修正版はファイルアップロードの際の ¥r¥n 問題も解決してくれます!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2760,17 +2729,10 @@ do?</a></h4>
 href="http://www.mysql.com/doc/R/e/Resetting_permissions.html">パーミッションをリセットする</a>方法が説明されています。</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> PHP が <tt>upload_tmp_dir</tt> を読み書きできるようになっていないと、アップロードしたクエリにはアクセスできません。</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> PHP の設定ファイルの <tt>post_max_size</tt> ディレクティブをチェックして、値を増やしてみてください。</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4367,6 +4329,29 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        新しい位置を保存するには、テーブルの下に「OK」ボタンをクリックする必要があります。新しい要素を配置する場合は、まず要素のテーブルに追加してください。新しい要素をドラッグできるようになります。
+    </p>
+    <p>
+        用紙の大きさや向きを変えると、スクラッチボードの大きさも変わります。これは下のドロップダウンフィールドを変更するだけで行えます。スクラッチボードの大きさは自動的に変わります。要素の現在位置は変わりません。
+    </p>
+    <p>
+        要素が範囲外に出てしまった場合、用紙の大きさを拡大するか、「リセット(reset)」ボタンをクリックして、すべての要素を縦一列に並べてください。
+    </p>
+
 <h3 id="faqproject">phpMyAdmin project</h3>
 
 <h4 id="faq7_1">
@@ -4871,6 +4856,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/pl/Documentation.html b/output/pl/Documentation.html
index c64c060..77fcd29 100644
--- a/output/pl/Documentation.html
+++ b/output/pl/Documentation.html
@@ -2105,13 +2105,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] array</dt>
@@ -2200,32 +2202,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        Aby zapisać nowe położenia, należy kliknąć na przycisk 'OK' pod tabelą.
-Jeżeli chcesz umieścić nowy element, najpierw dodaj go do tabeli elementów,
-a następnie go przeciągnij myszką.<br />
-        Poprzez zmianę wielkości papieru i orientacji, możesz zmienić także wielkość
-scratchboardu. Możesz to zrobić po prostu przez zmianę pozycji na liście
-rozwijanej, która znajduje się niżej, a scratchboard zmieni rozmiar
-automatycznie, nie wpływając na aktualne położenia elementów.<br />
-        Gdyby jakiś element znalazł się poza obszarem, możesz albo zwiększyć
-wielkość papieru, albo kliknąć na przycisk 'reset', aby umieścić wszystkie
-elementy pod sobą.<br />
-        <b>UWAGA:</b> By ten mechanizm zadziałał, wymagana jest nowoczesna
-przeglądarka, taka jak IE6 lub Mozilla.  Podstawowa funkcjonalność
-przeciągnij-i-upuść została uprzejmie pożyczona z www.youngpup.net i
-korzysta ze specjalnej licencji.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2725,8 +2701,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2772,24 +2747,7 @@ apache.apache /tmp/php</tt></li>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> W rzeczywistości nie jest to związane z phpMyAdminem, ale z RedHatem
-7.0. Masz RedHata 7.0 i zaktualizowałeś swój RPM z PHP do
-php-4.0.4pl1-3.i386.rpm, prawda?<br />
-    Tak więc problem polega na tym, że pakiet ten ma poważny błąd, który został
-poprawiony lata temu w PHP (2001-01-28: szczegóły w <a
-href="http://www.php.net/bugs.php?id=8966">systemie śledzenia błędów
-PHP</a>).  Problemem jest to, że błędny pakiet jest ciągle dostępny, mimo że
-został poprawiony (szczegóły w <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">bugzilli
-RedHata</a>).<br />
-    Proszę więc ściągnąć <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">poprawiony
-pakiet (4.0.4pl1-9)</a>, a problem powinien zniknąć.<br />
-    Przy okazji poprawia to problem \r\n z wysyłaniem plików!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2823,19 +2781,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html"> sprowadzić
 uprawnienia do stanu początkowego</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> Jeśli PHP nie ma praw do czytania/pisania do swojego
-<tt>upload_tmp_dir</tt>, nie ma też dostępu do wysłanego zapytania.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> Sprawdź dyrektywę <tt>post_max_size</tt> ze swojego pliku konfiguracyjnego
-PHP i spróbuj zwiększyć jej wartość.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4519,6 +4468,36 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        Aby zapisać nowe położenia, należy kliknąć na przycisk 'OK' pod tabelą.
+Jeżeli chcesz umieścić nowy element, najpierw dodaj go do tabeli elementów,
+a następnie go przeciągnij myszką.
+    </p>
+    <p>
+        Poprzez zmianę wielkości papieru i orientacji, możesz zmienić także wielkość
+scratchboardu. Możesz to zrobić po prostu przez zmianę pozycji na liście
+rozwijanej, która znajduje się niżej, a scratchboard zmieni rozmiar
+automatycznie, nie wpływając na aktualne położenia elementów.
+    </p>
+    <p>
+        Gdyby jakiś element znalazł się poza obszarem, możesz albo zwiększyć
+wielkość papieru, albo kliknąć na przycisk 'reset', aby umieścić wszystkie
+elementy pod sobą.
+    </p>
+
 <h3 id="faqproject">phpMyAdmin project</h3>
 
 <h4 id="faq7_1">
@@ -5031,6 +5010,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html
index 80a60b3..bd5edaf 100644
--- a/output/pt_BR/Documentation.html
+++ b/output/pt_BR/Documentation.html
@@ -2102,13 +2102,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] matriz</dt>
@@ -2197,30 +2199,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>booleano</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        You have to click on the 'OK'-button below the tables to save the new
-positions.  If you want to place a new element, first add it to the table of
-elements and then you can drag the new element around.<br />
-        By changing the paper size and the orientation you can change the size of
-the scratchboard as well. You can do so by just changing the dropdown field
-below, and the scratchboard will resize automatically, without interfering
-with the current placement of the elements.<br />
-        If ever an element gets out of range you can either enlarge the paper size
-or click on the 'reset' button to place all elements below each other.<br />
-        <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to get
-this control to work. The basic Drag&Drop script functionality was
-kindly borrowed from www.youngpup.net and is underlying so specific license.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] booleano</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2719,8 +2697,7 @@ PHP bug database.</p>
 <h4 id="faq1_5">
     <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
 Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
-<abbr title="HyperText Transfer Protocol">HTTP</abbr> or advanced
-authentication mode.</a></h4>
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> This is a known problem with the PHP <abbr title="Internet Server
 Application Programming Interface">ISAPI</abbr> filter: it's not so
@@ -2765,23 +2742,7 @@ enable uploads of files while being reasonably secure:</p>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> It's not really phpMyAdmin related but RedHat 7.0. You have a RedHat 7.0 and
-you updated your PHP RPM to php-4.0.4pl1-3.i386.rpm, didn't you?<br />
-    So the problem is that this package has a serious bug that was corrected
-ages ago in PHP (2001-01-28: see <a
-href="http://www.php.net/bugs.php?id=8966">PHP's bug tracking system</a> for
-more details). The problem is that the bugged package is still available
-though it was corrected (see <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat's
-BugZilla</a> for more details).<br />
-    So please download <a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">the fixed
-package (4.0.4pl1-9)</a> and the problem should go away.<br />
-    And that fixes the \r\n problem with file uploads!</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 I'm having troubles when uploading files with
@@ -2814,19 +2775,10 @@ href="http://www.mysql.com/doc/R/e/Resetting_permissions.html"> reset the
 permissions</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to execute a bookmark.</a></h4>
-
-<p> If PHP does not have read/write access to its <tt>upload_tmp_dir</tt>, it
-cannot access the uploaded query.</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> Check the <tt>post_max_size</tt> directive from your PHP configuration file
-and try to increase it.</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4507,6 +4459,35 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin com a versão</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        You have to click on the 'OK'-button below the tables to save the new
+positions.  If you want to place a new element, first add it to the table of
+elements and then you can drag the new element around.
+    </p>
+    <p>
+        By changing the paper size and the orientation you can change the size of
+the scratchboard as well. You can do so by just changing the dropdown field
+below, and the scratchboard will resize automatically, without interfering
+with the current placement of the elements.
+    </p>
+    <p>
+        If ever an element gets out of range you can either enlarge the paper size
+or click on the 'reset' button to place all elements below each other.
+    </p>
+
 <h3 id="faqproject">O projeto phpMyAdmin</h3>
 
 <h4 id="faq7_1">
@@ -5018,6 +4999,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html
index c79e299..3148669 100644
--- a/output/zh_CN/Documentation.html
+++ b/output/zh_CN/Documentation.html
@@ -1837,13 +1837,15 @@ similar to texts seen on export page, so you can easily identify what they
 mean.
     </dd>
 
-    <dt id="cfg_Export">$cfg['Export']['method'] string</dt>
+    <dt id="cfg_Export_method">$cfg['Export']['method'] string</dt>
     <dd>
         Defines how the export form is displayed when it loads. Valid values are:
+        <ul>
         <li><tt>quick</tt> to display the minimum number of options to configure</li>
         <li><tt>custom</tt> to display every available option to configure</li>
         <li><tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the
 option of using quick export</li>
+        </ul>
     </dd>
 
     <dt id="cfg_Import">$cfg['Import'] array</dt>
@@ -1932,30 +1934,6 @@ performance, this value is the maximum to be displayed, using a <code>SELECT
 COUNT ... LIMIT</code>. The default value of 0 bypasses any row counting.
     </dd>
 
-    <dt id="wysiwyg">
-        <span id="cfg_WYSIWYG-PDF">$cfg['WYSIWYG-PDF'] </span>boolean</dt>
-    <dd>Utilizes a WYSIWYG editing control to easily place elements of a <abbr
-title="Portable Document Format">PDF</abbr> page.  By clicking on the button
-'toggle scratchboard' on the page where you edit x/y coordinates of those
-elements you can activate a scratchboard where all your elements are
-placed. By clicking on an element, you can move them around in the
-pre-defined area and the x/y coordinates will get updated
-dynamically. Likewise, when entering a new position directly into the input
-field, the new position in the scratchboard changes after your cursor leaves
-the input field.<br />
-        You have to click on the 'OK'-button below the tables to save the new
-positions.  If you want to place a new element, first add it to the table of
-elements and then you can drag the new element around.<br />
-        By changing the paper size and the orientation you can change the size of
-the scratchboard as well. You can do so by just changing the dropdown field
-below, and the scratchboard will resize automatically, without interfering
-with the current placement of the elements.<br />
-        If ever an element gets out of range you can either enlarge the paper size
-or click on the 'reset' button to place all elements below each other.<br />
-        <b>NOTE:</b> You have to use a recent browser like IE6 or Mozilla to get
-this control to work. The basic Drag&Drop script functionality was
-kindly borrowed from www.youngpup.net and is underlying so specific license.</dd>
-
     <dt id="cfg_NaturalOrder">$cfg['NaturalOrder'] boolean</dt>
     <dd>Sorts database and table names according to natural order (for example, t1,
 t2, t10). Currently implemented in the left panel (Light mode)  and in
@@ -2443,9 +2421,9 @@ Protocol">HTTP</abbr> 头 ..."。</a>
 href="http://bugs.php.net/bug.php?id=12061">这个错误反馈</a>。</p>
 
 <h4 id="faq1_5">
-    <a href="#faq1_5">1.5 phpMyAdmin 运行在 <abbr title="Internet Information
-Services">IIS</abbr> 上,使用<abbr title="HyperText Transfer
-Protocol">HTTP</abbr> 认证。我的服务器总是崩溃(有时还伴随着大量的错误信息)。</a></h4>
+    <a href="#faq1_5">1.5 Using phpMyAdmin on <abbr title="Internet Information
+Services">IIS</abbr>, I'm facing crashes and/or many error messages with the
+<abbr title="HyperText Transfer Protocol">HTTP</abbr>.</a></h4>
 
 <p> 这是一个已知的 PHP <abbr title="Internet Server Application Programming
 Interface">ISAPI</abbr> 过滤器错误:PHP 的 ISAPI 过滤器不是很稳定,建议使用 cookie 认证方式。
@@ -2483,20 +2461,7 @@ support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p>
 </ul>
 
 <h4 id="faq1_9">
-    <a href="#faq1_9">1.9 I'm having troubles when uploading files. In general
-file uploads don't work on my system and uploaded files have a
-<tt>Content-Type:</tt> header in the first line.</a></h4>
-
-<p> 这不是 phpMyAdmin 的问题,而是 RedHat 7.0 的问题。您是不是在使用 RedHat 7.0 并使用
-php-4.0.4pl1-3.i386.rpm 更新了你的 PHP?<br />
-    这个问题是由一个很古老的 PHP 严重错误引起的(于 2001年1月28日,见:<a
-href="http://www.php.net/bugs.php?id=8966">PHP 错误追踪系统</a>)。虽然这个 PHP
-错误早已修复了,但是软件源中仍保留着有这个错误的软件包(见 <a
-href="http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=24933">RedHat
-错误追踪系统</a>,于是就引发了您遇到的问题。<br />
-    要解决此问题,请下载<a
-href="http://www.redhat.com/swr/i386/php-4.0.4pl1-9.i386.html">修复软件包(4.0.4pl1-9)</a>进行安装。<br />
-    安装之后,就能解决您遇到的问题。</p>
+    <a href="#faq1_9">1.9 (withdrawn).</a></h4>
 
 <h4 id="faq1_10">
     <a href="#faq1_10">1.10 我在上传文件的时候遇到了问题,phpMyAdmin 运行在安全服务器上,服务器软件是
@@ -2524,17 +2489,10 @@ class="configrule">$cfg['TempDir']</a> 设置为临时目录的路径。您上
 href="http://www.mysql.com/doc/R/e/Resetting_permissions.html">重设权限</a>.</p>
 
 <h4 id="faq1_13">
-    <a href="#faq1_13">1.13 在我试图运行一条书签的时候,得到了如下错误信息:'没有 <abbr title="structured
-query language">SQL</abbr> 查询'</a></h4>
-
-<p> 如果 PHP 对 <tt>upload_tmp_dir</tt> 目录没有读写权限,phpMyAdmin 将无法读取您上传的查询。</p>
+    <a href="#faq1_13">1.13 (withdrawn).</a></h4>
 
 <h4 id="faq1_14">
-    <a href="#faq1_14">1.14 I get an error 'No <abbr title="structured query
-language">SQL</abbr> query' when trying to submit a query from the
-convenient text area.</a></h4>
-
-<p> 检查 <tt>post_max_size</tt> 有没有在 PHP 的配置文件中显式指定,如果有,试着增加其大小。</p>
+    <a href="#faq1_14">1.14 (withdrawn).</a></h4>
 
 <h4 id="faq1_15">
     <a href="#faq1_15">1.15 I have problems with <i>mysql.user</i> column
@@ -4106,6 +4064,35 @@ href="#cfg_Servers_verbose">server configuration</a></dd>
         <dd>phpMyAdmin with version</dd>
 </dl>
 
+<h4 id="wysiwyg">
+    <a href="#wysiwyg">6.28 How can I easily edit relational schema for
+export?</a></h4>
+
+    <p> 
+        By clicking on the button 'toggle scratchboard' on the page where you edit
+x/y coordinates of those elements you can activate a scratchboard where all
+your elements are placed. By clicking on an element, you can move them
+around in the pre-defined area and the x/y coordinates will get updated
+dynamically. Likewise, when entering a new position directly into the input
+field, the new position in the scratchboard changes after your cursor leaves
+the input field.
+    </p>
+    <p>
+        You have to click on the 'OK'-button below the tables to save the new
+positions.  If you want to place a new element, first add it to the table of
+elements and then you can drag the new element around.
+    </p>
+    <p>
+        By changing the paper size and the orientation you can change the size of
+the scratchboard as well. You can do so by just changing the dropdown field
+below, and the scratchboard will resize automatically, without interfering
+with the current placement of the elements.
+    </p>
+    <p>
+        If ever an element gets out of range you can either enlarge the paper size
+or click on the 'reset' button to place all elements below each other.
+    </p>
+
 <h3 id="faqproject">phpMyAdmin project</h3>
 
 <h4 id="faq7_1">
@@ -4596,6 +4583,18 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li>
   <li>Replication support</li>
 </ul></li>
 
+<li>Muhammad Adnan (Google Summer of Code 2010)
+<ul>
+  <li>Relation schema export to multiple formats</li>
+</ul></li>
+
+<li>Lori Lee (Google Summer of Code 2010)
+<ul>
+  <li>User interface improvements</li>
+  <li>ENUM/SET editor</li>
+  <li>Simplified interface for export/import</li>
+</ul></li>
+
 <li>Barrie Leslie
 <ul>
   <li>BLOBstreaming support with PBMS PHP extension</li>
diff --git a/po/en_GB.po b/po/en_GB.po
index 19b95f5..343607b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-08-19 11:57+0300\n"
-"PO-Revision-Date: 2010-07-21 19:48+0200\n"
+"PO-Revision-Date: 2010-08-24 14:20+0200\n"
 "Last-Translator: Robert Readman <robert_readman at hotmail.com>\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -176,13 +176,12 @@ msgstr ""
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:71
-#, fuzzy
 msgid ""
 "For proper support of multibyte strings (eg. UTF-8, which is currently the "
 "default), you should install the mbstring and ctype extensions."
 msgstr ""
-"For proper support of multi-byte strings (eg. UTF-8, which is currently "
-"default), you should install mbstring and ctype extensions."
+"For proper support of multibyte strings (eg. UTF-8, which is currently the "
+"default), you should install the mbstring and ctype extensions."
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:75
@@ -219,13 +218,13 @@ msgstr ""
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:87
-#, fuzzy
 msgid ""
 "To support BLOB streaming, see PHP and MySQL requirements in <a href="
 "\"#faq6_25\"> <abbr title=\"Frequently Asked Questions\">FAQ</abbr> 6.25</a>."
 msgstr ""
-"support mysqli, the improved MySQL extension <a href=\"#faq1_17\"> (see "
-"<abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.17)</a>"
+"To support BLOB streaming, see PHP and MySQL requirements in <a "
+"href=\"#faq6_25\"> <abbr title=\"Frequently Asked Questions\">FAQ</abbr> "
+"6.25</a>."
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:92
@@ -477,9 +476,8 @@ msgstr "<a href=\"#setup_script\">Setup script usage</a>"
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:173
-#, fuzzy
 msgid "<a href=\"#linked-tables\">phpMyAdmin configuration storage</a>"
-msgstr "<a href=\"#linked-tables\">Linked-tables infrastructure</a>"
+msgstr "<a href=\"#linked-tables\">phpMyAdmin configuration storage</a>"
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:174
@@ -861,9 +859,8 @@ msgstr ""
 
 #. type: Content of: <html><body><div><h3>
 #: ../phpmyadmin/Documentation.html:329
-#, fuzzy
 msgid "phpMyAdmin configuration storage"
-msgstr "phpMyAdmin documentation"
+msgstr "phpMyAdmin configuration storage"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:331
@@ -975,7 +972,6 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:375
-#, fuzzy
 msgid ""
 "If you have upgraded your MySQL server from a version previous to 4.1.2 to "
 "version 5.x or newer and if you use the phpMyAdmin configuration storage, "
@@ -983,9 +979,9 @@ msgid ""
 "upgrade_tables_mysql_4_1_2+.sql</tt>."
 msgstr ""
 "If you have upgraded your MySQL server from a version previous to 4.1.2 to "
-"version 4.1.2 or newer and if you use the pmadb/linked table infrastructure, "
-"you should run the SQL script found in <tt>scripts/"
-"upgrade_tables_mysql_4_1_2+.sql</tt>."
+"version 5.x or newer and if you use the phpMyAdmin configuration storage, "
+"you should run the SQL script found in "
+"<tt>scripts/upgrade_tables_mysql_4_1_2+.sql</tt>."
 
 #. type: Content of: <html><body><div><h3>
 #: ../phpmyadmin/Documentation.html:380
@@ -1007,14 +1003,12 @@ msgstr ""
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:386
-#, fuzzy
 msgid ""
 "Nevertheless be aware that MS Internet Explorer seems to be really buggy "
 "about cookies, at least till version 6."
 msgstr ""
 "Nevertheless be aware that MS Internet Explorer seems to be really buggy "
-"about cookies, at least till version 6, and PHP 4.1.1 is also a bit buggy in "
-"this area!"
+"about cookies, at least till version 6."
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:388
@@ -1164,13 +1158,12 @@ msgstr "GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'local
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:445
-#, fuzzy
 msgid ""
 "(this of course requires that your <a href=\"#linked-tables\">phpMyAdmin "
 "configuration storage</a> be set up)."
 msgstr ""
-"(this of course requires that your <a href=\"#linked-tables\">linked-tables "
-"infrastructure</a> be set up)."
+"(this of course requires that your <a href=\"#linked-tables\">phpMyAdmin "
+"configuration storage</a> be set up)."
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:449
@@ -2289,26 +2282,24 @@ msgstr ""
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:868
-#, fuzzy
 msgid ""
 "The name of the database containing the phpMyAdmin configuration storage."
-msgstr "The name of the database containing the linked-tables infrastructure."
+msgstr ""
+"The name of the database containing the phpMyAdmin configuration storage."
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:871
-#, fuzzy
 msgid ""
 "See the <a href=\"#linked-tables\">phpMyAdmin configuration storage</a> "
 "section in this document to see the benefits of this feature, and for a "
 "quick way of creating this database and the needed tables."
 msgstr ""
-"See the <a href=\"#linked-tables\">Linked-tables infrastructure</a> section "
-"in this document to see the benefits of this infrastructure, and for a quick "
-"way of creating this database and the needed tables."
+"See the <a href=\"#linked-tables\">phpMyAdmin configuration storage</a> "
+"section in this document to see the benefits of this feature, and for a "
+"quick way of creating this database and the needed tables."
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:876
-#, fuzzy
 msgid ""
 "If you are the only user of this phpMyAdmin installation, you can use your "
 "current database to store those special tables; in this case, just put your "
@@ -2320,7 +2311,7 @@ msgstr ""
 "current database to store those special tables; in this case, just put your "
 "current database name in <tt>$cfg['Servers'][$i]['pmadb']</tt>. For a multi-"
 "user installation, set this parameter to the name of your central database "
-"containing the linked-tables infrastructure."
+"containing the phpMyAdmin configuration storage."
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:884
@@ -2353,11 +2344,10 @@ msgstr "To allow the usage of this functionality:"
 #: ../phpmyadmin/Documentation.html:951 ../phpmyadmin/Documentation.html:978
 #: ../phpmyadmin/Documentation.html:1009 ../phpmyadmin/Documentation.html:1049
 #: ../phpmyadmin/Documentation.html:1081 ../phpmyadmin/Documentation.html:1152
-#, fuzzy
 msgid ""
 "set up <a href=\"#pmadb\">pmadb</a> and the phpMyAdmin configuration storage"
 msgstr ""
-"set up <a href=\"#pmadb\">pmadb</a> and the linked-tables infrastructure"
+"set up <a href=\"#pmadb\">pmadb</a> and the phpMyAdmin configuration storage"
 
 #. type: Content of: <html><body><div><dl><dd><ul><li>
 #: ../phpmyadmin/Documentation.html:891
@@ -5624,25 +5614,25 @@ msgstr ""
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:2024
-#, fuzzy
 msgid "$cfg['Export']['method'] string"
-msgstr "$cfg['ThemePath'] string"
+msgstr "$cfg['Export']['method'] string"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:2026
 msgid ""
 "Defines how the export form is displayed when it loads. Valid values are:"
 msgstr ""
+"Defines how the export form is displayed when it loads. Valid values are:"
 
 #. type: Content of: <html><body><div><dl><dd><li>
 #: ../phpmyadmin/Documentation.html:2027
 msgid "<tt>quick</tt> to display the minimum number of options to configure"
-msgstr ""
+msgstr "<tt>quick</tt> to display the minimum number of options to configure"
 
 #. type: Content of: <html><body><div><dl><dd><li>
 #: ../phpmyadmin/Documentation.html:2028
 msgid "<tt>custom</tt> to display every available option to configure"
-msgstr ""
+msgstr "<tt>custom</tt> to display every available option to configure"
 
 #. type: Content of: <html><body><div><dl><dd><li>
 #: ../phpmyadmin/Documentation.html:2029
@@ -5650,6 +5640,8 @@ msgid ""
 "<tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the "
 "option of using quick export"
 msgstr ""
+"<tt>custom-no-form</tt> same as <tt>custom</tt> but does not display the "
+"option of using quick export"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:2032
@@ -6109,14 +6101,14 @@ msgstr ""
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:2191
-#, fuzzy
 msgid ""
 "Default queries that will be displayed in query boxes when user didn't "
 "specify any. You can use standard <a href=\"#faq6_27\">format string "
 "expansion</a>."
 msgstr ""
-"Allows you to specify window's title bar. You can use <a href="
-"\"#faq6_27\">format string expansion</a>."
+"Default queries that will be displayed in query boxes when user didn't "
+"specify any. You can use standard <a href=\"#faq6_27\">format string "
+"expansion</a>."
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:2196
@@ -6869,7 +6861,6 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:2434
-#, fuzzy
 msgid ""
 "Because the user cannot enter own mimetypes, it is kept sure that "
 "transformations always work. It makes no sense to apply a transformation to "
@@ -6877,11 +6868,10 @@ msgid ""
 msgstr ""
 "Because the user cannot enter own mimetypes, it is kept sure that "
 "transformations always work. It makes no sense to apply a transformation to "
-"a mimetype, the transform-function doesn't know to handle."
+"a mimetype the transform-function doesn't know to handle."
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:2438
-#, fuzzy
 msgid ""
 "One can, however, use empty mime-types and global transformations which "
 "should work for many mimetypes. You can also use transforms on a different "
@@ -6890,8 +6880,8 @@ msgid ""
 msgstr ""
 "One can, however, use empty mime-types and global transformations which "
 "should work for many mimetypes. You can also use transforms on a different "
-"mimetype they where built for, but pay attention to option usage as well as "
-"what the transformation does to your column."
+"mimetype than what they where built for, but pay attention to option usage "
+"as well as what the transformation does to your column."
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:2443
@@ -7269,15 +7259,14 @@ msgstr "Server"
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2591
-#, fuzzy
 msgid ""
 "<a href=\"#faq1_1\">1.1 My server is crashing each time a specific action is "
 "required or phpMyAdmin sends a blank page or a page full of cryptic "
 "characters to my browser, what can I do?</a>"
 msgstr ""
-"<a href=\"#faq1_1\">1.1 I'm running PHP 4+ and my server is crashing each "
-"time a specific action is required or phpMyAdmin sends a blank page or a "
-"page full of cryptic characters to my browser, what can I do?</a>"
+"<a href=\"#faq1_1\">1.1 My server is crashing each time a specific action is "
+"required or phpMyAdmin sends a blank page or a page full of cryptic "
+"characters to my browser, what can I do?</a>"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:2595
@@ -7326,9 +7315,8 @@ msgstr ""
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2611
-#, fuzzy
 msgid "<a href=\"#faq1_3\">1.3 (withdrawn).</a>"
-msgstr "<a href=\"#faq1_31\">1.31 Does phpMyAdmin support php5?</a>"
+msgstr "<a href=\"#faq1_3\">1.3 (withdrawn).</a>"
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2614
@@ -7415,17 +7403,16 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:2652
-#, fuzzy
 msgid ""
 "These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</"
 "tt> PHP functions to be more independent of the platform (Unix/Windows, Safe "
 "Mode or not, and so on). So, you must have Zlib/Bzip2 support (<tt>--with-"
 "zlib</tt> and <tt>--with-bz2</tt>)."
 msgstr ""
-"These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</"
-"tt> PHP functions to be more independent of the platform (Unix/Windows, Safe "
-"Mode or not, and so on). So, you must have PHP4 >= 4.0.4 and "
-"Zlib/Bzip2 support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>)."
+"These features are based on the <tt>gzencode()</tt> and "
+"<tt>bzcompress()</tt> PHP functions to be more independent of the platform "
+"(Unix/Windows, Safe Mode or not, and so on). So, you must have Zlib/Bzip2 "
+"support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>)."
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2658
@@ -7853,7 +7840,7 @@ msgstr ""
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2824
 msgid "<a href=\"#faq1_18\">1.18 (withdrawn).</a>"
-msgstr ""
+msgstr "<a href=\"#faq1_18\">1.18 (withdrawn).</a>"
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2827
@@ -8002,7 +7989,7 @@ msgstr "SHOW VARIABLES LIKE 'lower_case_table_names';"
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2880
 msgid "<a href=\"#faq1_24\">1.24 (withdrawn).</a>"
-msgstr ""
+msgstr "<a href=\"#faq1_24\">1.24 (withdrawn).</a>"
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:2883
@@ -10103,14 +10090,12 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:3693
-#, fuzzy
 msgid ""
 "MS Internet Explorer seems to be really buggy about cookies, at least till "
 "version 6."
 msgstr ""
-"Nevertheless be aware that MS Internet Explorer seems to be really buggy "
-"about cookies, at least till version 6, and PHP 4.1.1 is also a bit buggy in "
-"this area!"
+"MS Internet Explorer seems to be really buggy about cookies, at least till "
+"version 6."
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:3698
@@ -11443,27 +11428,25 @@ msgstr ""
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:4221
-#, fuzzy
 msgid ""
 "<a href=\"#faq6_20\">6.20 I see a lot of databases which are not mine, and "
 "cannot access them.  </a>"
 msgstr ""
-"<a href=\"#faq6_20\">6.20 In MySQL 4, I see a lot of databases which are not "
-"mine, and cannot access them.  </a>"
+"<a href=\"#faq6_20\">6.20 I see a lot of databases which are not mine, and "
+"cannot access them.  </a>"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4225
-#, fuzzy
 msgid ""
 "You have one of these global privileges: CREATE TEMPORARY TABLES, SHOW "
 "DATABASES, LOCK TABLES. Those privileges also enable users to see all the "
 "database names.  See this <a href=\"http://bugs.mysql.com/179\">bug report</"
 "a>."
 msgstr ""
-"Upgrading to MySQL 4 usually gives users those global privileges: CREATE "
-"TEMPORARY TABLES, SHOW DATABASES, LOCK TABLES. Those privileges also enable "
-"users to see all the database names.  See this <a href=\"http://bugs.mysql."
-"com/179\">bug report</a>."
+"You have one of these global privileges: CREATE TEMPORARY TABLES, SHOW "
+"DATABASES, LOCK TABLES. Those privileges also enable users to see all the "
+"database names.  See this <a href=\"http://bugs.mysql.com/179\">bug "
+"report</a>."
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4230
@@ -11601,78 +11584,73 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4286
-#, fuzzy
 msgid ""
 "For general information about BLOB streaming on MySQL, visit <a href="
 "\"http://blobstreaming.org\">blobstreaming.org</a>. You need the following "
 "components:"
 msgstr ""
-"First, for general information about BLOB streaming on MySQL, visit <a href="
-"\"http://blobstreaming.org\">blobstreaming.org</a>. We currently support "
-"streaming if you are running MySQL 5.1 with the PBXT and PBMS storage "
-"engines. Moreover, only PBMS 0.5.04 is supported."
+"For general information about BLOB streaming on MySQL, visit <a "
+"href=\"http://blobstreaming.org\">blobstreaming.org</a>. You need the "
+"following components:"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4288
 msgid "PBMS BLOB Streaming Daemon for MySQL (0.5.15 or later)"
-msgstr ""
+msgstr "PBMS BLOB Streaming Daemon for MySQL (0.5.15 or later)"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4289
 msgid "Streaming enabled PBXT Storage engine for MySQL (1.0.11-6 or later)"
-msgstr ""
+msgstr "Streaming enabled PBXT Storage engine for MySQL (1.0.11-6 or later)"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4291
 msgid "PBMS Client Library for MySQL (0.5.15 or later)"
-msgstr ""
+msgstr "PBMS Client Library for MySQL (0.5.15 or later)"
 
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4292
 msgid "PBMS PHP Extension for MySQL (0.1.1 or later)"
-msgstr ""
+msgstr "PBMS PHP Extension for MySQL (0.1.1 or later)"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4295
 msgid "Here are details about configuration and operation:"
-msgstr ""
+msgstr "Here are details about configuration and operation:"
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:4298
-#, fuzzy
 msgid ""
 "In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully "
 "qualified domain name) instead of "localhost"."
 msgstr ""
 "In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully "
-"qualified domain name) instead of something like "localhost"."
+"qualified domain name) instead of "localhost"."
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:4299
-#, fuzzy
 msgid ""
 "Ensure that your target table is under the <tt>PBXT</tt> storage engine and "
 "has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove "
 "the BLOB reference from it)."
 msgstr ""
-"Ensure that your target table is under the PBXT storage engine and has a "
-"LONGBLOB column."
+"Ensure that your target table is under the <tt>PBXT</tt> storage engine and "
+"has a <tt>LONGBLOB</tt> column (which must be nullable if you want to remove "
+"the BLOB reference from it)."
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:4300
-#, fuzzy
 msgid ""
 "When you insert or update a row in this table, put a checkmark on the ""
 "Upload to BLOB repository" optional choice; otherwise, the upload will "
 "be done directly in your LONGBLOB column instead of the repository."
 msgstr ""
-"When you insert or update a row in this table, put a checkmark on the ""
-"Upload to BLOB repository" optional choice; otherwise, the upload will "
-"be done directly in your column instead of the repository."
+"When you insert or update a row in this table, put a checkmark on the "
+""Upload to BLOB repository" optional choice; otherwise, the upload "
+"will be done directly in your LONGBLOB column instead of the repository."
 
 #. type: Content of: <html><body><div><ol><li>
 #: ../phpmyadmin/Documentation.html:4301
-#, fuzzy
 msgid ""
 "Finally when you browse your table, you'll see in your column a link to "
 "stream your data, for example "View image". A header containing "
@@ -11682,8 +11660,7 @@ msgstr ""
 "Finally when you browse your table, you'll see in your column a link to "
 "stream your data, for example "View image". A header containing "
 "the correct MIME-type will be sent to your browser; this MIME-type was "
-"stored at upload time but in case it's incorrect, it's possible to edit it "
-"by clicking on the displayed MIME-type."
+"stored at upload time."
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:4305
@@ -11708,7 +11685,6 @@ msgstr "<a href=\"#faq6_27\">6.27 What format strings can I use?</a>"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4314
-#, fuzzy
 msgid ""
 "In all places where phpMyAdmin accepts format strings, you can use "
 "<code>@VARIABLE@</code> expansion and <a href=\"http://php.net/strftime"
@@ -11717,10 +11693,10 @@ msgid ""
 "name), but the following variables can be used:"
 msgstr ""
 "In all places where phpMyAdmin accepts format strings, you can use "
-"<code>@VARIABLE@</code> expansion and <a href=\"http://php.net/strftime"
-"\">strftime</a> format strings. The expanded variables depend on a context "
-"(e.g. if you don't have chosen table, you can not get table name), but "
-"following variables can be used:"
+"<code>@VARIABLE@</code> expansion and <a "
+"href=\"http://php.net/strftime\">strftime</a> format strings. The expanded "
+"variables depend on a context (for example, if you haven't chosen a table, "
+"you can not get the table name), but the following variables can be used:"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:4321
@@ -11788,15 +11764,13 @@ msgstr "Currently opened table"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:4333
-#, fuzzy
 msgid "<code>@FIELDS@</code>"
-msgstr "<code>@VERBOSE@</code>"
+msgstr "<code>@FIELDS@</code>"
 
 #. type: Content of: <html><body><div><dl><dd>
 #: ../phpmyadmin/Documentation.html:4334
-#, fuzzy
 msgid "Fields of currently opened table"
-msgstr "Currently opened table"
+msgstr "Fields of currently opened table"
 
 #. type: Content of: <html><body><div><dl><dt>
 #: ../phpmyadmin/Documentation.html:4335
@@ -11918,7 +11892,6 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4385
-#, fuzzy
 msgid ""
 "Documentation is being translated using po4a and gettext (see <a href="
 "\"http://www.phpmyadmin.net/home_page/docs.php\">documentation</a> for "
@@ -11932,17 +11905,17 @@ msgid ""
 "our <a href=\"https://sourceforge.net/tracker/?group_id=23067&"
 "atid=387645\">translation tracker</a>."
 msgstr ""
-"Documentation is being translated using po4a and gettext (see <a href="
-"\"http://www.phpmyadmin.net/home_page/docs.php\">documentation</a> for "
-"existing translations). To start, checkout <a href=\"http://phpmyadmin.git."
-"sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po"
-"\"><code>localized_docs/po</code></a> from Git, or just go to the <a href="
-"\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a> and "
-"translate it online. If your language is missing, just contact <a href="
-"\"mailto:michal at cihar.com\">Michal Čihař</a>; he will add it. If you prefer "
-"to directly translate the po files, please put updated ones into our <a href="
-"\"https://sourceforge.net/tracker/?group_id=23067&"
-"atid=387645\">translation tracker</a>."
+"Documentation is being translated using po4a and gettext (see <a "
+"href=\"http://www.phpmyadmin.net/home_page/docs.php\">documentation</a> for "
+"existing translations). To start, checkout <a href=\"http://phpmyadmin.git.so"
+"urceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po\"><code>"
+"localized_docs/po</code></a> from Git, or just go to the <a "
+"href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a> and "
+"translate it online. If your language is missing, just contact <a "
+"href=\"mailto:michal at cihar.com\">Michal Čihař</a>; he will add it. "
+"If you prefer to directly translate the po files, please put updated ones "
+"into our <a href=\"https://sourceforge.net/tracker/?group_id=23067&atid=3"
+"87645\">translation tracker</a>."
 
 #. type: Content of: <html><body><div><h4>
 #: ../phpmyadmin/Documentation.html:4397
@@ -12392,7 +12365,7 @@ msgstr "Copyright"
 
 #. type: Content of: <html><body><div><pre>
 #: ../phpmyadmin/Documentation.html:4574
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
@@ -12408,13 +12381,16 @@ msgstr ""
 "Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
 "                        Olivier Müller <om_at_omnis.ch>\n"
-"                        Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"                        Robin Johnson "
+"<robbat2_at_users.sourceforge.net>\n"
 "                        Alexander M. Turek <me_at_derrabus.de>\n"
-"                        Michal Čihař <michal_at_cihar.com>\n"
+"                        Michal Čihař <michal_at_cihar.com>\n"
 "                        Garvin Hicking <me_at_supergarv.de>\n"
 "                        Michael Keck <mkkeck_at_users.sourceforge.net>\n"
-"                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
-"                        [check <a href=\"#credits\">credits</a> for more details]\n"
+"                        Sebastian Mendel "
+"<cybot_tm_at_users.sourceforge.net>\n"
+"                        [check <a href=\"#credits\">credits</a> for more "
+"details]\n"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4587
@@ -13048,13 +13024,12 @@ msgstr "Replication support"
 #. type: Content of: <html><body><div><ul><li>
 #: ../phpmyadmin/Documentation.html:4834
 msgid "Barrie Leslie"
-msgstr ""
+msgstr "Barrie Leslie"
 
 #. type: Content of: <html><body><div><ul><li><ul><li>
 #: ../phpmyadmin/Documentation.html:4836
-#, fuzzy
 msgid "BLOBstreaming support with PBMS PHP extension"
-msgstr "BLOBstreaming support"
+msgstr "BLOBstreaming support with PBMS PHP extension"
 
 #. type: Content of: <html><body><div><p>
 #: ../phpmyadmin/Documentation.html:4842


hooks/post-receive
-- 
phpMyAdmin localized documentation




More information about the Git mailing list