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

Michal Čihař nijel at users.sourceforge.net
Tue Sep 7 16:06:04 CEST 2010


The branch, master has been updated
       via  ddda8dfd2857495cf2afcb52775a81159cc9e930 (commit)
       via  f09872f7a5c09713665da5029ffa2f805e914d57 (commit)
      from  e1b3fbb36916b7661fe4c081d81e3efa262b072f (commit)


- Log -----------------------------------------------------------------
commit ddda8dfd2857495cf2afcb52775a81159cc9e930
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Sep 7 16:05:45 2010 +0200

    Forgotten files for credits.

commit f09872f7a5c09713665da5029ffa2f805e914d57
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Sep 7 16:05:23 2010 +0200

    Refresh to match current master.

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

Summary of changes:
 Makefile                        |   10 +-
 addendum/add-html_credits       |    2 +
 addendum/credits.html           |    6 +
 addendum/html_credits.ca        |    6 +
 addendum/html_credits.cs        |    6 +
 addendum/html_credits.de        |    6 +
 addendum/html_credits.en_GB     |    6 +
 addendum/html_credits.es        |    6 +
 addendum/html_credits.fi        |    6 +
 addendum/html_credits.fr        |    6 +
 addendum/html_credits.gl        |    6 +
 addendum/html_credits.hu        |    6 +
 addendum/html_credits.hy        |    6 +
 addendum/html_credits.it        |    6 +
 addendum/html_credits.ja        |    6 +
 addendum/html_credits.ka        |    6 +
 addendum/html_credits.lt        |    6 +
 addendum/html_credits.mn        |    6 +
 addendum/html_credits.nb        |    6 +
 addendum/html_credits.nl        |    6 +
 addendum/html_credits.pl        |    6 +
 addendum/html_credits.pt_BR     |    6 +
 addendum/html_credits.ro        |    6 +
 addendum/html_credits.sk        |    6 +
 addendum/html_credits.sl        |    6 +
 addendum/html_credits.sv        |    6 +
 addendum/html_credits.tr        |    6 +
 addendum/html_credits.zh_CN     |    6 +
 addendum/html_credits.zh_TW     |    6 +
 output/ca/docs.css              |    1 -
 output/ca/translators.html      |    2 -
 output/cs/Documentation.html    |   11 +-
 output/cs/INSTALL               |    2 -
 output/cs/README                |  112 ++++++-----
 output/cs/TODO                  |    2 -
 output/cs/docs.css              |    1 -
 output/cs/index.html            |    1 -
 output/cs/translators.html      |    4 +-
 output/de/docs.css              |    1 -
 output/de/translators.html      |    2 -
 output/en_GB/Documentation.html |    5 -
 output/en_GB/INSTALL            |    2 -
 output/en_GB/README             |   74 -------
 output/en_GB/TODO               |    2 -
 output/en_GB/docs.css           |    1 -
 output/en_GB/translators.html   |    2 -
 output/es/docs.css              |    1 -
 output/es/translators.html      |    2 -
 output/fi/docs.css              |    1 -
 output/fi/translators.html      |    2 -
 output/fr/Documentation.html    |    5 -
 output/fr/INSTALL               |    2 -
 output/fr/README                |   73 -------
 output/fr/TODO                  |    2 -
 output/fr/docs.css              |    1 -
 output/fr/translators.html      |    2 -
 output/gl/docs.css              |    1 -
 output/gl/translators.html      |    2 -
 output/hu/docs.css              |    1 -
 output/hu/translators.html      |    2 -
 output/hy/docs.css              |    1 -
 output/it/Documentation.html    |    5 -
 output/it/INSTALL               |    9 -
 output/it/TODO                  |    2 -
 output/it/docs.css              |    1 -
 output/it/translators.html      |    2 -
 output/ja/Documentation.html    |    5 -
 output/ja/docs.css              |    1 -
 output/ja/translators.html      |    2 -
 output/ka/docs.css              |    1 -
 output/ka/translators.html      |    2 -
 output/lt/docs.css              |    1 -
 output/lt/translators.html      |    2 -
 output/mn/docs.css              |    1 -
 output/mn/translators.html      |    2 -
 output/nb/docs.css              |    1 -
 output/nb/translators.html      |    2 -
 output/nl/docs.css              |    1 -
 output/nl/translators.html      |    2 -
 output/pl/Documentation.html    |    5 -
 output/pl/docs.css              |    1 -
 output/pl/translators.html      |    2 -
 output/pt_BR/Documentation.html |    5 -
 output/pt_BR/INSTALL            |    6 +-
 output/pt_BR/README             |   74 -------
 output/pt_BR/TODO               |    6 +-
 output/pt_BR/docs.css           |    1 -
 output/pt_BR/translators.html   |    2 -
 output/ro/docs.css              |    1 -
 output/ro/translators.html      |    2 -
 output/sk/docs.css              |    1 -
 output/sk/translators.html      |    2 -
 output/sl/INSTALL               |    9 -
 output/sl/TODO                  |   10 -
 output/sl/docs.css              |    1 -
 output/sl/translators.html      |    2 -
 output/sv/docs.css              |    1 -
 output/sv/translators.html      |    2 -
 output/tr/docs.css              |    1 -
 output/tr/translators.html      |    2 -
 output/zh_CN/Documentation.html |    5 -
 output/zh_CN/INSTALL            |    4 +-
 output/zh_CN/README             |   72 -------
 output/zh_CN/TODO               |    4 +-
 output/zh_CN/docs.css           |    1 -
 output/zh_CN/translators.html   |    2 -
 output/zh_TW/docs.css           |    1 -
 output/zh_TW/translators.html   |    2 -
 po/ca.po                        |  232 ++++++++++------------
 po/cs.po                        |  407 +++++++++++++++++++++------------------
 po/de.po                        |  232 ++++++++++------------
 po/en_GB.po                     |  367 ++++++++++++++++++++---------------
 po/es.po                        |  232 ++++++++++------------
 po/fi.po                        |  230 ++++++++++------------
 po/fr.po                        |  373 ++++++++++++++++++++----------------
 po/gl.po                        |  230 ++++++++++------------
 po/hu.po                        |  230 ++++++++++------------
 po/hy.po                        |  211 +++++++++-----------
 po/it.po                        |  244 +++++++++++-------------
 po/ja.po                        |  237 ++++++++++-------------
 po/ka.po                        |  230 ++++++++++------------
 po/lt.po                        |  235 ++++++++++------------
 po/mn.po                        |  226 ++++++++++------------
 po/nb.po                        |  230 ++++++++++------------
 po/nl.po                        |  233 ++++++++++------------
 po/pl.po                        |  241 +++++++++++-------------
 po/pt_BR.po                     |  365 ++++++++++++++++++++---------------
 po/ro.po                        |  230 ++++++++++------------
 po/sk.po                        |  230 ++++++++++------------
 po/sl.po                        |  247 +++++++++++-------------
 po/sv.po                        |  230 ++++++++++------------
 po/tr.po                        |  235 ++++++++++------------
 po/zh_CN.po                     |  360 +++++++++++++++++++---------------
 po/zh_TW.po                     |  226 ++++++++++------------
 pot/ca-full.pot                 |  211 +++++++++-----------
 pot/ca-txt.pot                  |  219 ++++++++++-----------
 pot/cs-full.pot                 |  221 ++++++++++-----------
 pot/cs-txt.pot                  |  219 ++++++++++-----------
 pot/de-full.pot                 |  221 ++++++++++-----------
 pot/de-txt.pot                  |  219 ++++++++++-----------
 pot/en_GB-full.pot              |  221 ++++++++++-----------
 pot/en_GB-txt.pot               |  219 ++++++++++-----------
 pot/es-full.pot                 |  221 ++++++++++-----------
 pot/es-txt.pot                  |  219 ++++++++++-----------
 pot/fi-full.pot                 |  221 ++++++++++-----------
 pot/fi-txt.pot                  |  219 ++++++++++-----------
 pot/fr-full.pot                 |  221 ++++++++++-----------
 pot/fr-txt.pot                  |  219 ++++++++++-----------
 pot/gl-full.pot                 |  221 ++++++++++-----------
 pot/gl-txt.pot                  |  219 ++++++++++-----------
 pot/hu-full.pot                 |  221 ++++++++++-----------
 pot/hu-txt.pot                  |  219 ++++++++++-----------
 pot/hy-full.pot                 |  221 ++++++++++-----------
 pot/hy-txt.pot                  |  219 ++++++++++-----------
 pot/it-full.pot                 |  221 ++++++++++-----------
 pot/it-txt.pot                  |  219 ++++++++++-----------
 pot/ja-full.pot                 |  221 ++++++++++-----------
 pot/ja-txt.pot                  |  219 ++++++++++-----------
 pot/ka-full.pot                 |  221 ++++++++++-----------
 pot/ka-txt.pot                  |  219 ++++++++++-----------
 pot/lt-full.pot                 |  221 ++++++++++-----------
 pot/lt-txt.pot                  |  219 ++++++++++-----------
 pot/mn-full.pot                 |  221 ++++++++++-----------
 pot/mn-txt.pot                  |  219 ++++++++++-----------
 pot/nb-full.pot                 |  221 ++++++++++-----------
 pot/nb-txt.pot                  |  219 ++++++++++-----------
 pot/nl-full.pot                 |  221 ++++++++++-----------
 pot/nl-txt.pot                  |  219 ++++++++++-----------
 pot/pl-full.pot                 |  221 ++++++++++-----------
 pot/pl-txt.pot                  |  219 ++++++++++-----------
 pot/pt_BR-full.pot              |  221 ++++++++++-----------
 pot/pt_BR-txt.pot               |  219 ++++++++++-----------
 pot/ro-full.pot                 |  221 ++++++++++-----------
 pot/ro-txt.pot                  |  219 ++++++++++-----------
 pot/sk-full.pot                 |  221 ++++++++++-----------
 pot/sk-txt.pot                  |  219 ++++++++++-----------
 pot/sl-full.pot                 |  221 ++++++++++-----------
 pot/sl-txt.pot                  |  219 ++++++++++-----------
 pot/sv-full.pot                 |  221 ++++++++++-----------
 pot/sv-txt.pot                  |  219 ++++++++++-----------
 pot/tr-full.pot                 |  221 ++++++++++-----------
 pot/tr-txt.pot                  |  219 ++++++++++-----------
 pot/zh_CN-full.pot              |  221 ++++++++++-----------
 pot/zh_CN-txt.pot               |  219 ++++++++++-----------
 pot/zh_TW-full.pot              |  221 ++++++++++-----------
 pot/zh_TW-txt.pot               |  219 ++++++++++-----------
 186 files changed, 8890 insertions(+), 10049 deletions(-)
 create mode 100644 addendum/add-html_credits
 create mode 100644 addendum/credits.html
 create mode 100644 addendum/html_credits.ca
 create mode 100644 addendum/html_credits.cs
 create mode 100644 addendum/html_credits.de
 create mode 100644 addendum/html_credits.en_GB
 create mode 100644 addendum/html_credits.es
 create mode 100644 addendum/html_credits.fi
 create mode 100644 addendum/html_credits.fr
 create mode 100644 addendum/html_credits.gl
 create mode 100644 addendum/html_credits.hu
 create mode 100644 addendum/html_credits.hy
 create mode 100644 addendum/html_credits.it
 create mode 100644 addendum/html_credits.ja
 create mode 100644 addendum/html_credits.ka
 create mode 100644 addendum/html_credits.lt
 create mode 100644 addendum/html_credits.mn
 create mode 100644 addendum/html_credits.nb
 create mode 100644 addendum/html_credits.nl
 create mode 100644 addendum/html_credits.pl
 create mode 100644 addendum/html_credits.pt_BR
 create mode 100644 addendum/html_credits.ro
 create mode 100644 addendum/html_credits.sk
 create mode 100644 addendum/html_credits.sl
 create mode 100644 addendum/html_credits.sv
 create mode 100644 addendum/html_credits.tr
 create mode 100644 addendum/html_credits.zh_CN
 create mode 100644 addendum/html_credits.zh_TW
 delete mode 100644 output/en_GB/README
 delete mode 100644 output/fr/README
 delete mode 100644 output/it/INSTALL
 delete mode 100644 output/pt_BR/README
 delete mode 100644 output/sl/INSTALL
 delete mode 100644 output/sl/TODO
 delete mode 100644 output/zh_CN/README

diff --git a/Makefile b/Makefile
index c9a0035..aed6b72 100755
--- a/Makefile
+++ b/Makefile
@@ -33,15 +33,15 @@ output/%/translators.html.stamp: po/%.po addendum/html_head-translations.% adden
 	touch $@
 
 output/%/README.stamp: po/%.po ../phpmyadmin/README
-	po4a-translate -f text -m ../phpmyadmin/README -p $< -l output/$*/README ${PO4AOPTS}
+	po4a-translate -f text -o asciidoc -m ../phpmyadmin/README -p $< -l output/$*/README ${PO4AOPTS}
 	touch $@
 
 output/%/TODO.stamp: po/%.po ../phpmyadmin/TODO
-	po4a-translate -f text -m ../phpmyadmin/TODO -p $< -l output/$*/TODO ${PO4AOPTS}
+	po4a-translate -f text -o asciidoc -m ../phpmyadmin/TODO -p $< -l output/$*/TODO ${PO4AOPTS}
 	touch $@
 
 output/%/INSTALL.stamp: po/%.po ../phpmyadmin/INSTALL
-	po4a-translate -f text -m ../phpmyadmin/INSTALL -p $< -l output/$*/INSTALL ${PO4AOPTS}
+	po4a-translate -f text -o asciidoc -m ../phpmyadmin/INSTALL -p $< -l output/$*/INSTALL ${PO4AOPTS}
 	touch $@
 
 .PRECIOUS: addendum/html_head.%
@@ -54,7 +54,7 @@ addendum/html_head-translations.%: po/%.po addendum/head.html addendum/add-html_
 
 .PRECIOUS: addendum/html_comment.%
 addendum/html_comment.%: po/%.po addendum/comment.html addendum/add-html_comment
-	po4a-translate -f text -m addendum/comment.html -p $< -l $@ ${PO4AOPTS} -k 0 --addendum addendum/add-html_comment
+	po4a-translate -f text -o asciidoc -m addendum/comment.html -p $< -l $@ ${PO4AOPTS} -k 0 --addendum addendum/add-html_comment
 
 .PRECIOUS: addendum/html_credits.%
 addendum/html_credits.%: po/%.po addendum/credits.html addendum/add-html_credits
@@ -99,7 +99,7 @@ pot/%-html.pot: ../phpmyadmin/Documentation.html ../phpmyadmin/translators.html
 
 .PRECIOUS: pot/%-txt.pot
 pot/%-txt.pot: ../phpmyadmin/INSTALL ../phpmyadmin/TODO ../phpmyadmin/README addendum/comment.html
-	po4a-gettextize -f text ${PO4A_PO_OPTS} \
+	po4a-gettextize -f text -o asciidoc ${PO4A_PO_OPTS} \
 		-m addendum/comment.html \
 		-m  ../phpmyadmin/INSTALL \
 		-m ../phpmyadmin/TODO \
diff --git a/addendum/add-html_credits b/addendum/add-html_credits
new file mode 100644
index 0000000..d48965a
--- /dev/null
+++ b/addendum/add-html_credits
@@ -0,0 +1,2 @@
+PO4A-HEADER:mode=before;position=<p>
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
diff --git a/addendum/credits.html b/addendum/credits.html
new file mode 100644
index 0000000..1ab6fdf
--- /dev/null
+++ b/addendum/credits.html
@@ -0,0 +1,6 @@
+<p>
+This translation was brought to you by various translators
+on
+<a href="https://l10n.cihar.com/projects/pmadoc/">translation
+server</a>. They should have written their names here.
+</p>
diff --git a/addendum/html_credits.ca b/addendum/html_credits.ca
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.ca
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.cs b/addendum/html_credits.cs
new file mode 100644
index 0000000..2ecafdf
--- /dev/null
+++ b/addendum/html_credits.cs
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+Tento překlad vznikl spoluprácí překladatelů na <a
+href="https://l10n.cihar.com/projects/pmadoc/">překladovém serveru</a>. Mimo
+jiné se na něm podíleli: Michal Čihař.
+</p>
diff --git a/addendum/html_credits.de b/addendum/html_credits.de
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.de
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.en_GB b/addendum/html_credits.en_GB
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.en_GB
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.es b/addendum/html_credits.es
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.es
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.fi b/addendum/html_credits.fi
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.fi
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.fr b/addendum/html_credits.fr
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.fr
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.gl b/addendum/html_credits.gl
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.gl
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.hu b/addendum/html_credits.hu
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.hu
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.hy b/addendum/html_credits.hy
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.hy
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.it b/addendum/html_credits.it
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.it
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.ja b/addendum/html_credits.ja
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.ja
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.ka b/addendum/html_credits.ka
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.ka
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.lt b/addendum/html_credits.lt
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.lt
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.mn b/addendum/html_credits.mn
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.mn
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.nb b/addendum/html_credits.nb
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.nb
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.nl b/addendum/html_credits.nl
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.nl
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.pl b/addendum/html_credits.pl
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.pl
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.pt_BR b/addendum/html_credits.pt_BR
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.pt_BR
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.ro b/addendum/html_credits.ro
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.ro
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.sk b/addendum/html_credits.sk
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.sk
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.sl b/addendum/html_credits.sl
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.sl
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.sv b/addendum/html_credits.sv
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.sv
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.tr b/addendum/html_credits.tr
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.tr
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.zh_CN b/addendum/html_credits.zh_CN
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.zh_CN
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/addendum/html_credits.zh_TW b/addendum/html_credits.zh_TW
new file mode 100644
index 0000000..d97fbe2
--- /dev/null
+++ b/addendum/html_credits.zh_TW
@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=before;position=<h2 id="glossary">
+<p>
+This translation was brought to you by various translators on <a
+href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
+should have written their names here.
+</p>
diff --git a/output/ca/docs.css b/output/ca/docs.css
index e9defb7..1d0f08d 100644
--- a/output/ca/docs.css
+++ b/output/ca/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/ca/translators.html b/output/ca/translators.html
index f7fec18..f5558c5 100644
--- a/output/ca/translators.html
+++ b/output/ca/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/cs/Documentation.html b/output/cs/Documentation.html
index 9151489..c93dfae 100644
--- a/output/cs/Documentation.html
+++ b/output/cs/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 Tento soubor je generovaný pomocí po4a, prosím neupravujte ho!
@@ -69,9 +67,6 @@ phpMyAdmina na SourceForge</a></li>
             <li>Licence: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Verze dokumentace:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
@@ -5069,9 +5064,9 @@ and or just some feedback.
 </p>
 
 <p>
-This translation was brought to you by various translators on <a
-href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They
-should have written their names here.
+Tento překlad vznikl spoluprácí překladatelů na <a
+href="https://l10n.cihar.com/projects/pmadoc/">překladovém serveru</a>. Mimo
+jiné se na něm podíleli: Michal Čihař.
 </p>
 <h2 id="glossary">Slovníček</h2>
 
diff --git a/output/cs/INSTALL b/output/cs/INSTALL
index 7080dee..6ce2cb8 100644
--- a/output/cs/INSTALL
+++ b/output/cs/INSTALL
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Instalace
 ----------------------
 
diff --git a/output/cs/README b/output/cs/README
index ab6b4f1..9a3ea08 100644
--- a/output/cs/README
+++ b/output/cs/README
@@ -1,74 +1,78 @@
-$Id$
+phpMyAdmina - čtěte mě
+=========================
 
-phpMyAdmin - Čtěte mě
-=====================
+Sada PHP skriptů pro správu MySQL přes web.
 
-  Sada PHP skriptů pro správu MySQL přes web.
+Verze 3.4.0-dev
+---------------
 
-  Verze 3.4.0-dev
-  ---------------
-  http://www.phpmyadmin.net/
+http://www.phpmyadmin.net/
 
-    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
-                            Olivier Müller <om_at_omnis.ch>
-                            Robin Johnson <robbat2_at_users.sourceforge.net>
-                            Alexander M. Turek <me_at_derrabus.de>
-                            Michal Čihař <michal_at_cihar.com>
-                            Garvin Hicking <me_at_supergarv.de>
-                            Michael Keck <mkkeck_at_users.sourceforge.net>
-                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-                            [v souboru Documentation.txt/.html naleznete více podrobností]
+Copyright (C) 1998-2000 
+    Tobias Ratschiller <tobias_at_ratschiller.com>
+Copyright (C) 2001-2010 
+    Marc Delisle <marc_at_infomarc.info>
+    Olivier Müller <om_at_omnis.ch>
+    Robin Johnson <robbat2_at_users.sourceforge.net>
+    Alexander M. Turek <me_at_derrabus.de>
+    Michal Čihař <michal_at_cihar.com>
+    Garvin Hicking <me_at_supergarv.de>
+    Michael Keck <mkkeck_at_users.sourceforge.net>
+    Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
+    [check Documentation.txt/.html file for more details]
 
-    Tento program je svobodný software; můžete jej šířit a modifikovat podle
-    ustanovení GNU General Public License verze 2, vydávané Free Software
-    Foundation.
+Tento program je svobodný software; můžete jej šířit a modifikovat podle
+ustanovení GNU General Public License verze 2, vydávané Free Software
+Foundation.
 
-    Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ
-    JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo
-    VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General
-    Public License.
+Tento program je rozšiřován v naději, že bude užitečný, avšak BEZJAKÉKOLI
+ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI aneboVHODNOSTI PRO
+URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General Public License.
 
-    Kopii GNU General Public License jste měl obdržet spolu s tímto
-    programem; pokud se tak nestalo, napište o ni Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Kopii GNU General Public License jste měl obdržet spolu s tímtoprogramem;
+pokud se tak nestalo, napište o ni Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-  Požadavky:
-    php 5.2 nebo novější
-    MySQL 5.0 nebo novější
-    webový prohlížeč (překvapivě!)
+Požadavky
+~~~~~~~~~~
 
-  Summary:
-    phpMyAdmin is intended to handle the administration of MySQL over the web.
-    For a summary of features, please see the Documentation.txt/.html file.
+* PHP 5.2 nebo novější
+* MySQL 5.0 nebo novější
+* prohlížeč webu (překvapivě!)
 
-  Stáhnout:
-    Nejnovější verze naleznete na http://www.phpmyadmin.net/.
+Souhrn
+~~~~~~
 
-  Poděkování:
-    Poděkování naleznete v souboru Documentation.txt/.html.
+phpMyAdmin je nástroj pro správu MySQL přes web. Podrobnější přehled
+vlastností naleznete v souboru Documentation.txt/.html.
 
-  Instalace:
-    Popis instalace naleznete v souboru Documentation.txt/.html.
+Stáhnout
+~~~~~~~~~
 
-  Popis změn:
-    Popis změn naleznete v souboru ChangeLog
+Nejnovější verze naleznete na http://www.phpmyadmin.net/.
 
-  Dokumentace:
-    Základní dokumentace je dostupná v souborech Documentation.txt/.html
+Více informací
+~~~~~~~~~~~~~~~~
 
-  Podpora:
-    Informace o podpoe naleznete na http://www.phpmyadmin.net/
+Viz soubor Documentation.txt/.html.
 
+Podpora
+~~~~~~~
 
-    Užijte si to!
-        Tým vývojářů phpMyAdmina
+Informace o podpoře naleznete na http://www.phpmyadmin.net/
 
 
-  PS: Please, don't send us emails with question like "How do I compile
-      PHP with MySQL-support". We just don't have the time to be your
-      free helpdesk.
-      Please send your questions to the appropriate mailinglists / forums.
-      Before contacting us, please read the Documentation.html (esp. the
-      FAQ part).
+Užijte si to!
+~~~~~~~~~~~~~~
+
+Tým vývojářů phpMyAdmina
+
+
+PS: 
+    Please, don't send us emails with question like "How do I compile
+    PHP with MySQL-support". We just don't have the time to be your
+    free helpdesk.
+    Please send your questions to the appropriate mailinglists / forums.
+    Before contacting us, please read the Documentation.html (esp. the
+    FAQ part).
 
diff --git a/output/cs/TODO b/output/cs/TODO
index 7376a67..3fab535 100644
--- a/output/cs/TODO
+++ b/output/cs/TODO
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Todo
 =================
 
diff --git a/output/cs/docs.css b/output/cs/docs.css
index e9defb7..1d0f08d 100644
--- a/output/cs/docs.css
+++ b/output/cs/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/cs/index.html b/output/cs/index.html
index b05ff93..1ffd131 100644
--- a/output/cs/index.html
+++ b/output/cs/index.html
@@ -12,7 +12,6 @@
 <ul>
 <li><a href="Documentation.html">Hlavní dokumentace</a></li>
 <li><a href="INSTALL">INSTALL</a></li>
-<li><a href="README">README</a></li>
 <li><a href="TODO">TODO</a></li>
 <li><a href="translators.html">Překladatelé</a></li>
 </ul>
diff --git a/output/cs/translators.html b/output/cs/translators.html
index 0efdd49..b2b9e9b 100644
--- a/output/cs/translators.html
+++ b/output/cs/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
@@ -441,7 +439,7 @@ budou poskytovat podporu po emailu.</span></p>
 </tr>
 
 <tr id="telugu">
-    <td>Telugu</td>
+    <td>Telugština</td>
     <td>
         veeven (veeven at gmail.com)
     </td>
diff --git a/output/de/docs.css b/output/de/docs.css
index e9defb7..1d0f08d 100644
--- a/output/de/docs.css
+++ b/output/de/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/de/translators.html b/output/de/translators.html
index 30f65b4..3989a97 100644
--- a/output/de/translators.html
+++ b/output/de/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html
index c6204f3..d8f46e6 100644
--- a/output/en_GB/Documentation.html
+++ b/output/en_GB/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 This file is generated using po4a, do not edit!
@@ -69,9 +67,6 @@ phpMyAdmin project page</a></li>
             <li>License: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Documentation version:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/en_GB/INSTALL b/output/en_GB/INSTALL
index 29bc6de..56c8948 100644
--- a/output/en_GB/INSTALL
+++ b/output/en_GB/INSTALL
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Installation
 -------------------------
 
diff --git a/output/en_GB/README b/output/en_GB/README
deleted file mode 100644
index e6e5c37..0000000
--- a/output/en_GB/README
+++ /dev/null
@@ -1,74 +0,0 @@
-$Id$
-
-phpMyAdmin - Readme
-===================
-
-  A set of PHP-scripts to manage MySQL over the web.
-
-  Version 3.4.0-dev
-  -----------------
-  http://www.phpmyadmin.net/
-
-    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
-                            Olivier Müller <om_at_omnis.ch>
-                            Robin Johnson <robbat2_at_users.sourceforge.net>
-                            Alexander M. Turek <me_at_derrabus.de>
-                            Michal Čihař <michal_at_cihar.com>
-                            Garvin Hicking <me_at_supergarv.de>
-                            Michael Keck <mkkeck_at_users.sourceforge.net>
-                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-                            [check Documentation.txt/.html file for more details]
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2,
-    as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Requirements:
-    php 5.2 or later
-    MySQL 5.0 or later
-    a web-browser (doh!)
-
-  Summary:
-    phpMyAdmin is intended to handle the administration of MySQL over the web.
-    For a summary of features, please see the Documentation.txt/.html file.
-
-  Download:
-    You can get the newest version at http://www.phpmyadmin.net/.
-
-  Credits:
-    Please see the Documentation.txt/.html file.
-
-  Installation:
-    Please see the Documentation.txt/.html file.
-
-  ChangeLog:
-    Now in ChangeLog
-
-  Documentation:
-    Basic documentation available in Documentation.txt/.html
-
-  Support:
-    See reference about support forums under http://www.phpmyadmin.net/
-
-
-    Enjoy!
-        The phpMyAdmin Devel team
-
-
-  PS: Please, don't send us e-mails with question like "How do I compile
-      PHP with MySQL-support". We just don't have the time to be your
-      free helpdesk.
-      Please send your questions to the appropriate mailinglists / forums.
-      Before contacting us, please read the Documentation.html (esp. the
-      FAQ part).
-
diff --git a/output/en_GB/TODO b/output/en_GB/TODO
index 503e029..7e96527 100644
--- a/output/en_GB/TODO
+++ b/output/en_GB/TODO
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Todo
 =================
 
diff --git a/output/en_GB/docs.css b/output/en_GB/docs.css
index e9defb7..1d0f08d 100644
--- a/output/en_GB/docs.css
+++ b/output/en_GB/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/en_GB/translators.html b/output/en_GB/translators.html
index ef34bb2..cfaffc1 100644
--- a/output/en_GB/translators.html
+++ b/output/en_GB/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/es/docs.css b/output/es/docs.css
index e9defb7..1d0f08d 100644
--- a/output/es/docs.css
+++ b/output/es/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/es/translators.html b/output/es/translators.html
index 0c2d278..4163f97 100644
--- a/output/es/translators.html
+++ b/output/es/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/fi/docs.css b/output/fi/docs.css
index e9defb7..1d0f08d 100644
--- a/output/fi/docs.css
+++ b/output/fi/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/fi/translators.html b/output/fi/translators.html
index f8c0df0..01a056b 100644
--- a/output/fi/translators.html
+++ b/output/fi/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/fr/Documentation.html b/output/fr/Documentation.html
index e590951..7e50ea6 100644
--- a/output/fr/Documentation.html
+++ b/output/fr/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 Ce fichier a été généré en utilisant po4a, ne pas éditer !
@@ -69,9 +67,6 @@ phpMyAdmin sur SourceForge</a></li>
             <li>Licence : <a href="LICENSE">LICENCE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Version de la documentation :</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/fr/INSTALL b/output/fr/INSTALL
index 4fbf00e..b0fc72c 100644
--- a/output/fr/INSTALL
+++ b/output/fr/INSTALL
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Installation
 -------------------------
 
diff --git a/output/fr/README b/output/fr/README
deleted file mode 100644
index 69649b4..0000000
--- a/output/fr/README
+++ /dev/null
@@ -1,73 +0,0 @@
-$Id$
-
-phpMyAdmin - Lisez-moi
-======================
-
-  Un ensemble de scripts PHP pour administrer MySQL par Internet.
-
-  Version 3.4.0-dev
-  -----------------
-  http://www.phpmyadmin.net/
-
-Copyright © 1998-2000   Tobias Ratschiller <tobias_at_ratschiller.com>
-Copyright © 2001-2010   Marc Delisle <marc_at_infomarc.info>
-                        Olivier Müller <om_at_omnis.ch>
-                        Robin Johnson <robbat2_at_users.sourceforge.net>
-                        Alexander M. Turek <me_at_derrabus.de>
-                        Michal Čihař <michal_at_cihar.com>
-                        Garvin Hicking <me_at_supergarv.de>
-                        Michael Keck <mkkeck_at_users.sourceforge.net>
-                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-                        [consulter le fichier Documentation.txt/html pour plus de détails]
-
-    Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier
-    en respectant les termes de la GNU General Public License version 2 (Licence publique générale GNU) 
-    telle qu'elle est publiée par la Free Software Foundation (Fondation pour le logiciel libre).
-
-    Ce programme est distribué en espérant être utile, mais SANS AUCUNE GARANTIE; 
-    sans même la garantie implicite COMMERCIALE ou D'ADÉQUATION POUR UNE UTILISATION
-    PARTICULIÈRE. Voir la GNU General Public License pour plus de renseignements.
-
-    Vous devriez avoir reçu une copie de la GNU General Public License
-    avec ce programme; si ce n'est pas le cas, écrivez à Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Prérequis :
-    - php 5.2 ou ultérieur
-    - MySQL 5.0 ou ultérieur
-        Remarque : La mise en oeuvre de l'aide pour MySQL 4.1.x et 5.0.x est expérimentale!
-                   Pour plus de renseignements, voir Documentation.txt / .html
-    - un navigateur (ben ça alors!)
-
-  Résumé :
-    phpMyAdmin est destiné à la conduite de l'administration de MySQL par l'Internet.
-    Pour un résumé des fonctionnalités, veuillez consulter le fichier Documentation.fr.txt/.html.
-
-  Télécharger :
-    Vous pouvez obtenir la dernière version sur http://www.phpmyadmin.net/.
-
-  Crédits :
-    Veuillez consulter le fichier Documentation.fr.txt/.html.
-
-  Installation :
-    Veuillez consulter le fichier Documentation.fr.txt/.html.
-
-  Journal des changements :
-    Maintenant dans le fichier ChangeLog
-
-  Documentation :
-    La documentation de base est disponible dans Documentation.fr.txt/.html
-
-  Aide :
-    Voir les indications sur les forums d'aide sur http://www.phpmyadmin.net/
-
-
-    Profitez!
-        L'équipe de développement de phpMyAdmin
-
-
-  PS : S'il vous plaît, ne nous envoyez pas de courriels avec des questions du genre "Comment dois-je compiler
-       PHP3 avec MySQL". Nous n'avons vraiment pas le temps d'être votre helpdesk gratuit.
-       Veuillez envoyer vos questions aux listes de diffusion / forums appropriés.
-       Avant de nous contacter, veuillez lire le fichier Documentation.html (particulièrement la partie FAQ).
-
diff --git a/output/fr/TODO b/output/fr/TODO
index 8af4398..8c43c98 100644
--- a/output/fr/TODO
+++ b/output/fr/TODO
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Todo
 =================
 
diff --git a/output/fr/docs.css b/output/fr/docs.css
index e9defb7..1d0f08d 100644
--- a/output/fr/docs.css
+++ b/output/fr/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/fr/translators.html b/output/fr/translators.html
index 4102455..894ae64 100644
--- a/output/fr/translators.html
+++ b/output/fr/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/gl/docs.css b/output/gl/docs.css
index e9defb7..1d0f08d 100644
--- a/output/gl/docs.css
+++ b/output/gl/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/gl/translators.html b/output/gl/translators.html
index 19b8a66..ab1cb67 100644
--- a/output/gl/translators.html
+++ b/output/gl/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/hu/docs.css b/output/hu/docs.css
index e9defb7..1d0f08d 100644
--- a/output/hu/docs.css
+++ b/output/hu/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/hu/translators.html b/output/hu/translators.html
index 718e72f..33d8f91 100644
--- a/output/hu/translators.html
+++ b/output/hu/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/hy/docs.css b/output/hy/docs.css
index e9defb7..1d0f08d 100644
--- a/output/hy/docs.css
+++ b/output/hy/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/it/Documentation.html b/output/it/Documentation.html
index bb42c64..c2f2d74 100644
--- a/output/it/Documentation.html
+++ b/output/it/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 This file is generated using po4a, do not edit!
@@ -69,9 +67,6 @@ href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>.
             <li>Licenza: <a href="license.php">LICENZA</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Versione documentazione:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/it/INSTALL b/output/it/INSTALL
deleted file mode 100644
index 29bc6de..0000000
--- a/output/it/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-$Id$
-
-phpMyAdmin - Installation
--------------------------
-
-	Please have a look to the Documentation.txt or 
-	Documentation.html files.
-
-
diff --git a/output/it/TODO b/output/it/TODO
index 503e029..7e96527 100644
--- a/output/it/TODO
+++ b/output/it/TODO
@@ -1,5 +1,3 @@
-$Id$
-
 phpMyAdmin - Todo
 =================
 
diff --git a/output/it/docs.css b/output/it/docs.css
index e9defb7..1d0f08d 100644
--- a/output/it/docs.css
+++ b/output/it/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/it/translators.html b/output/it/translators.html
index e7ea559..05c0bf4 100644
--- a/output/it/translators.html
+++ b/output/it/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html
index 5a022fd..02eb685 100644
--- a/output/ja/Documentation.html
+++ b/output/ja/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 This file is generated using po4a, do not edit!
@@ -69,9 +67,6 @@ phpMyAdmin project page</a></li>
             <li>ライセンス: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Documentation version:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/ja/docs.css b/output/ja/docs.css
index e9defb7..1d0f08d 100644
--- a/output/ja/docs.css
+++ b/output/ja/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/ja/translators.html b/output/ja/translators.html
index 0139788..8b7d983 100644
--- a/output/ja/translators.html
+++ b/output/ja/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/ka/docs.css b/output/ka/docs.css
index e9defb7..1d0f08d 100644
--- a/output/ka/docs.css
+++ b/output/ka/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/ka/translators.html b/output/ka/translators.html
index 5125e00..9b853f1 100644
--- a/output/ka/translators.html
+++ b/output/ka/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/lt/docs.css b/output/lt/docs.css
index e9defb7..1d0f08d 100644
--- a/output/lt/docs.css
+++ b/output/lt/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/lt/translators.html b/output/lt/translators.html
index d49db28..1b662ab 100644
--- a/output/lt/translators.html
+++ b/output/lt/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/mn/docs.css b/output/mn/docs.css
index e9defb7..1d0f08d 100644
--- a/output/mn/docs.css
+++ b/output/mn/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/mn/translators.html b/output/mn/translators.html
index 9aae02e..9d14285 100644
--- a/output/mn/translators.html
+++ b/output/mn/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/nb/docs.css b/output/nb/docs.css
index e9defb7..1d0f08d 100644
--- a/output/nb/docs.css
+++ b/output/nb/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/nb/translators.html b/output/nb/translators.html
index d5465c0..ad51532 100644
--- a/output/nb/translators.html
+++ b/output/nb/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/nl/docs.css b/output/nl/docs.css
index e9defb7..1d0f08d 100644
--- a/output/nl/docs.css
+++ b/output/nl/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/nl/translators.html b/output/nl/translators.html
index cd51cfe..d338d91 100644
--- a/output/nl/translators.html
+++ b/output/nl/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/pl/Documentation.html b/output/pl/Documentation.html
index da95fae..8a2a23a 100644
--- a/output/pl/Documentation.html
+++ b/output/pl/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 This file is generated using po4a, do not edit!
@@ -69,9 +67,6 @@ phpMyAdmin project page</a></li>
             <li>Licencja: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Documentation version:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/pl/docs.css b/output/pl/docs.css
index e9defb7..1d0f08d 100644
--- a/output/pl/docs.css
+++ b/output/pl/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/pl/translators.html b/output/pl/translators.html
index 919d9b2..b53a1c1 100644
--- a/output/pl/translators.html
+++ b/output/pl/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/pt_BR/Documentation.html b/output/pt_BR/Documentation.html
index 8cc2f42..1d3befa 100644
--- a/output/pt_BR/Documentation.html
+++ b/output/pt_BR/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 Este arquivo é gerado usando po4a, não edite!
@@ -69,9 +67,6 @@ phpMyAdmin no SourceForge</a></li>
             <li>Licença: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
-    <li><div class="l10n">Versão da documentação:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/pt_BR/INSTALL b/output/pt_BR/INSTALL
index 9da910e..88e4a01 100644
--- a/output/pt_BR/INSTALL
+++ b/output/pt_BR/INSTALL
@@ -1,7 +1,5 @@
-$Id$
-
-phpMyAdmin - Instalação
------------------------
+phpMyAdmin - Installation
+-------------------------
 
 	Por favor, dê uma olhada nos arquivos 
 	Documentation.txt ou Documentation.html.
diff --git a/output/pt_BR/README b/output/pt_BR/README
deleted file mode 100644
index 49b0f6e..0000000
--- a/output/pt_BR/README
+++ /dev/null
@@ -1,74 +0,0 @@
-$Id$
-
-phpMyAdmin - Leia-me
-====================
-
-  Um conjunto de scripts PHP para gerenciar o MySQL pela web.
-
-  Versão 3.4.0-dev
-  ----------------
-  http://www.phpmyadmin.net/
-
-    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
-                            Olivier Müller <om_at_omnis.ch>
-                            Robin Johnson <robbat2_at_users.sourceforge.net>
-                            Alexander M. Turek <me_at_derrabus.de>
-                            Michal Čihař <michal_at_cihar.com>
-                            Garvin Hicking <me_at_supergarv.de>
-                            Michael Keck <mkkeck_at_users.sourceforge.net>
-                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-                            [veja o arquivo Documentation.txt/.html para mais detalhes]
-
-    Este programa é um software livre; você pode redistribuí-lo
-    e/ou modificá-lo sob os termos da GNU General Public License
-    versão 2, conforme publicada pela Free Software Foundation.
-
-    Este programa é distribuído na esperança de ser útil, mas
-    SEM QUALQUER GARANTIA; sem mesmo a garantia implícita
-    de COMERCIABILIDADE ou ADEQUAÇÃO A UM PROPÓSITO
-    PARTICULAR. Veja a GNU General Public License para mais detalhes.
-
-    Você deve ter recebido uma cópia da GNU General Public License
-    junto com este programa; se não, escreva para a Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  Requisitos:
-    php 5.2 ou posterior
-    MySQL 5.0 ou posterior
-    um navegador (é claro!)
-
-  Resumo:
-    O phpMyAdmin destina-se a lidar com a administração do MySQL pela web.
-    Para um resumo das características, consulte o arquivo Documentation.txt/.html.
-
-  Download:
-    Você pode obter a versão mais nova em http://www.phpmyadmin.net/.
-
-  Créditos:
-    Consulte o arquivo Documentation.txt/.html.
-
-  Instalação:
-    Consulte o arquivo Documentation.txt/.html.
-
-  Registro das alterações:
-    Está em ChangeLog
-
-  Documentação:
-    A documentação está disponível no arquivo Documentation.txt/.html.
-
-  Suporte:
-    Veja a referência sobre fóruns de suporte em http://www.phpmyadmin.net/
-
-
-    Divirta-se!
-        A Equipe de Desenvolvimento do phpMyAdmin
-
-
-  Obs: Por favor, não nos envie e-mails com perguntas do tipo "Como faço para
-       compilar o PHP com suporte a MySQL". Nós simplesmente não temos tempo
-       para ser seu suporte técnico gratuito.
-       Por favor, envie suas perguntas para as listas de discussão ou fóruns
-       apropriados. Antes de entrar em contatar conosco, por favor leia o arquivo
-       Documentation.html (especialmente a parte FAQ).
-
diff --git a/output/pt_BR/TODO b/output/pt_BR/TODO
index 47b1eba..827292e 100644
--- a/output/pt_BR/TODO
+++ b/output/pt_BR/TODO
@@ -1,7 +1,5 @@
-$Id$
-
-phpMyAdmin - Tarefas
-====================
+phpMyAdmin - Todo
+=================
 
 No momento, estamos usando o SourceForge Tracker como lista de tarefas:
 
diff --git a/output/pt_BR/docs.css b/output/pt_BR/docs.css
index e9defb7..1d0f08d 100644
--- a/output/pt_BR/docs.css
+++ b/output/pt_BR/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/pt_BR/translators.html b/output/pt_BR/translators.html
index 21cb174..247e480 100644
--- a/output/pt_BR/translators.html
+++ b/output/pt_BR/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/ro/docs.css b/output/ro/docs.css
index e9defb7..1d0f08d 100644
--- a/output/ro/docs.css
+++ b/output/ro/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/ro/translators.html b/output/ro/translators.html
index b75d2c4..8099ded 100644
--- a/output/ro/translators.html
+++ b/output/ro/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/sk/docs.css b/output/sk/docs.css
index e9defb7..1d0f08d 100644
--- a/output/sk/docs.css
+++ b/output/sk/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/sk/translators.html b/output/sk/translators.html
index 1248cd9..934e617 100644
--- a/output/sk/translators.html
+++ b/output/sk/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/sl/INSTALL b/output/sl/INSTALL
deleted file mode 100644
index 0e32c91..0000000
--- a/output/sl/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-$Id$
-
-phpMyAdmin - Namestitev
--------------------------
-
-	Please have a look to the Documentation.txt or 
-	Documentation.html files.
-
-
diff --git a/output/sl/TODO b/output/sl/TODO
deleted file mode 100644
index 503e029..0000000
--- a/output/sl/TODO
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id$
-
-phpMyAdmin - Todo
-=================
-
-We are currently using the Sourceforge Tracker as Todo list:
-
-  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse
-
--- swix/20010704
diff --git a/output/sl/docs.css b/output/sl/docs.css
index e9defb7..1d0f08d 100644
--- a/output/sl/docs.css
+++ b/output/sl/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/sl/translators.html b/output/sl/translators.html
index 64fa1f3..4b559b2 100644
--- a/output/sl/translators.html
+++ b/output/sl/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/sv/docs.css b/output/sv/docs.css
index e9defb7..1d0f08d 100644
--- a/output/sv/docs.css
+++ b/output/sv/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/sv/translators.html b/output/sv/translators.html
index 6e8ae8b..326e48e 100644
--- a/output/sv/translators.html
+++ b/output/sv/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/tr/docs.css b/output/tr/docs.css
index e9defb7..1d0f08d 100644
--- a/output/tr/docs.css
+++ b/output/tr/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/tr/translators.html b/output/tr/translators.html
index 85d96cb..4b47cd3 100644
--- a/output/tr/translators.html
+++ b/output/tr/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/zh_CN/Documentation.html b/output/zh_CN/Documentation.html
index bab3e08..1820cd6 100644
--- a/output/zh_CN/Documentation.html
+++ b/output/zh_CN/Documentation.html
@@ -6,8 +6,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-
-<!-- $Id$ -->
 <!--
 
 本文件使用 po4a 自动生成,请勿手动编辑!
@@ -68,9 +66,6 @@ SourceForge.net 的项目页 (英语)</a></li>
             <li>授权: <a href="license.php">授权 (LICENSE,英语)</a></li>
         </ul>
     </li>
-    <li><div class="l10n">文档版本:</div>
-        <i>$Id$</i>
-    </li>
 </ul>
 
 
diff --git a/output/zh_CN/INSTALL b/output/zh_CN/INSTALL
index 71f1d1c..3f125fd 100644
--- a/output/zh_CN/INSTALL
+++ b/output/zh_CN/INSTALL
@@ -1,6 +1,4 @@
-$Id$
-
-phpMyAdmin - 安装
+phpMyAdmin - Installation
 -------------------------
 
 	参见 Documentation.txt 或 
diff --git a/output/zh_CN/README b/output/zh_CN/README
deleted file mode 100644
index b1d53fc..0000000
--- a/output/zh_CN/README
+++ /dev/null
@@ -1,72 +0,0 @@
-$Id$
-
-phpMyAdmin - 说明
-===================
-
-  使用 PHP 编写,通过 web 管理 MySQL 的工具。
-
-  版本 3.4.0-dev
-  -----------------
-  http://www.phpmyadmin.net/
-
-    版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
-    版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>
-                            Olivier Müller <om_at_omnis.ch>
-                            Robin Johnson <robbat2_at_users.sourceforge.net>
-                            Alexander M. Turek <me_at_derrabus.de>
-                            Michal Čihař <michal_at_cihar.com>
-                            Garvin Hicking <me_at_supergarv.de>
-                            Michael Keck <mkkeck_at_users.sourceforge.net>
-                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-                            [详细信息请参见 Documentation.txt/.html 文件]
-
-    本软件是自由软件,你可以在自由软件基金会发布的
-    GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。
-
-    本软件因希望能对大家有用而发布,
-    但没有任何担保,也没有任何适销性
-    或针对特定用途的隐含的担保。参见
-    GNU 通用公共许可协议获得详细信息。
-
-    你应该在获得此软件的同时收到一份 GNU 通用公共许可协议的副本
-    如果没有,请致函 Free Software Foundation, Inc.,
-    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-  环境需求:
-    php 5.2 或更高版本
-    MySQL 5.0 或更高版本
-    一个网页浏览器
-
-  概要:
-    phpMyAdmin 旨在通过 web 管理 MySQL 。
-    具体功能请参见 Documentation.txt/.html 文件。
-
-  下载:
-    你可以在 http://www.phpmyadmin.net/ 获得最新版本。
-
-  鸣谢:
-    参见 Documentation.txt/.html 文件。
-
-  安装:
-    参见 Documentation.txt/.html 文件。
-
-  更新记录:
-    参见 ChangeLog 文件
-
-  文档:
-    基本文档参见 Documentation.txt/.html
-
-  支持:
-    参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息
-
-
-    尽情享受吧!
-        phpMyAdmin 开发组
-
-
-  附: 请勿向我们发送邮件询问诸如 "怎样编译
-      支持 MySQL 的 PHP" 之类的问题。我们
-      没有时间做您的免费咨询台。
-      请将您的问题发送到相应的邮件列表或论坛。
-      在联系我们之前,请阅读 Documentation.html (特别是 FAQ 部分)。
-
diff --git a/output/zh_CN/TODO b/output/zh_CN/TODO
index cb1fabc..072b518 100644
--- a/output/zh_CN/TODO
+++ b/output/zh_CN/TODO
@@ -1,6 +1,4 @@
-$Id$
-
-phpMyAdmin - 计划
+phpMyAdmin - Todo
 =================
 
 目前我们将 Sourceforge 的追踪器作为计划表使用:
diff --git a/output/zh_CN/docs.css b/output/zh_CN/docs.css
index e9defb7..1d0f08d 100644
--- a/output/zh_CN/docs.css
+++ b/output/zh_CN/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/zh_CN/translators.html b/output/zh_CN/translators.html
index f4896a2..8e34579 100644
--- a/output/zh_CN/translators.html
+++ b/output/zh_CN/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/output/zh_TW/docs.css b/output/zh_TW/docs.css
index e9defb7..1d0f08d 100644
--- a/output/zh_TW/docs.css
+++ b/output/zh_TW/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
 /* Stylesheet for phpMyAdmin documentation */
 /* vim: expandtab ts=4 sw=4 sts=4 tw=78
 */
diff --git a/output/zh_TW/translators.html b/output/zh_TW/translators.html
index ae81e2c..573a6fb 100644
--- a/output/zh_TW/translators.html
+++ b/output/zh_TW/translators.html
@@ -4,8 +4,6 @@
     version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
 
 
-
-<!-- $Id$ -->
 <!--
     vim: expandtab ts=4 sw=4 sts=4 tw=78
 -->
diff --git a/po/ca.po b/po/ca.po
index 1f43fb8..178c159 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9626,16 +9626,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9643,8 +9649,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11569,203 +11578,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentació de phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "pàgina principal de phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "pàgina principal de phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Requisits"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatible amb MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Descarrega"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n
"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informació"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #, fuzzy
diff --git a/po/cs.po b/po/cs.po
index c9d2a91..a1a1b71 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,12 +5,13 @@
 #
 # Automatically generated <>, 2009.
 # Michal <michal at cihar.com>, 20, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: po 4a\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
-"PO-Revision-Date: 2010-04-30 10:50+0200\n"
+"PO-Revision-Date: 2010-09-07 16:00+0200\n"
 "Last-Translator: Michal <michal at cihar.com>\n"
 "Language-Team: Czech <cs at li.org>\n"
 "Language: cs\n"
@@ -9876,8 +9877,11 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [více detailů naleznete <a href=\"#credits\">zde</a>]\n"
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
@@ -9887,8 +9891,11 @@ msgstr ""
 "ustanovení GNU General Public License verze 2, vydávané Free Software "
 "Foundation."
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9899,8 +9906,11 @@ msgstr ""
 "ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI aneboVHODNOSTI PRO "
 "URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General Public License."
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11750,13 +11760,12 @@ msgstr "Albert Fazlí (amichauer at gmx.de)"
 #. type: Content of: <html><body><div><table><tr><td>
 #: ../phpmyadmin/translators.html:426
 msgid "Telugu"
-msgstr ""
+msgstr "Telugština"
 
 #. type: Content of: <html><body><div><table><tr><td>
 #: ../phpmyadmin/translators.html:428
-#, fuzzy
 msgid "veeven (veeven at gmail.com)"
-msgstr "Sven-Erik Andersen (sven.erik.andersen at gmail.com)"
+msgstr "veeven (veeven at gmail.com)"
 
 #. type: Content of: <html><body><div><table><tr><td>
 #: ../phpmyadmin/translators.html:433
@@ -11842,6 +11851,9 @@ msgid ""
 "\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>. They "
 "should have written their names here."
 msgstr ""
+"Tento překlad vznikl spoluprácí překladatelů na <a href=\"https://l10n.cihar."
+"com/projects/pmadoc/\">překladovém serveru</a>. Mimo jiné se na něm "
+"podíleli: Michal Čihař."
 
 #. type: Plain text
 #: addendum/comment.html:2
@@ -11869,23 +11881,14 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - Instalace\n"
-"----------------------\n"
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin - Instalace\n"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
@@ -11894,229 +11897,265 @@ msgstr ""
 "\tProsím podívejte se do souboru Documentation.txt nebo \n"
 "\tDocumentation.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin - Todo\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr "Místo seznamu úkolů používáme tracker na Sourceforge:"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
-msgstr ""
-"phpMyAdmin - Čtěte mě\n"
-"=====================\n"
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmina - čtěte mě\n"
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr "Sada PHP skriptů pro správu MySQL přes web."
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
-msgstr "  Sada PHP skriptů pro správu MySQL přes web.\n"
+msgid "Version 3.4.0-dev\n"
+msgstr "Verze 3.4.0-dev\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
-msgstr ""
-"  Verze 3.4.0-dev\n"
-"  ---------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
+msgstr "http://www.phpmyadmin.net/"
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-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"
-"                            Alexander M. Turek <me_at_derrabus.de>\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"
-"                            [v souboru Documentation.txt/.html naleznete více podrobností]\n"
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
-msgstr ""
-"    Tento program je svobodný software; můžete jej šířit a modifikovat podle\n"
-"    ustanovení GNU General Public License verze 2, vydávané Free Software\n"
-"    Foundation.\n"
+msgid "Requirements\n"
+msgstr "Požadavky\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
-"    Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ\n"
-"    JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI anebo\n"
-"    VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General\n"
-"    Public License.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
+msgstr "PHP 5.2 nebo novější"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
-"    Kopii GNU General Public License jste měl obdržet spolu s tímto\n"
-"    programem; pokud se tak nestalo, napište o ni Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 5.0 nebo novější"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
-msgstr ""
-"  Požadavky:\n"
-"    php 5.2 nebo novější\n"
-"    MySQL 5.0 nebo novější\n"
-"    webový prohlížeč (překvapivě!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr "prohlížeč webu (překvapivě!)"
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
-msgstr ""
+msgid "Summary\n"
+msgstr "Souhrn\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
-"  Stáhnout:\n"
-"    Nejnovější verze naleznete na http://www.phpmyadmin.net/.\n"
+"phpMyAdmin je nástroj pro správu MySQL přes web. Podrobnější přehled "
+"vlastností naleznete v souboru Documentation.txt/.html."
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
-"  Poděkování:\n"
-"    Poděkování naleznete v souboru Documentation.txt/.html.\n"
+msgid "Download\n"
+msgstr "Stáhnout\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
-"  Instalace:\n"
-"    Popis instalace naleznete v souboru Documentation.txt/.html.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr "Nejnovější verze naleznete na http://www.phpmyadmin.net/."
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
-"  Popis změn:\n"
-"    Popis změn naleznete v souboru ChangeLog\n"
+msgid "More Information\n"
+msgstr "Více informací\n"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr "Viz soubor Documentation.txt/.html."
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
-msgstr ""
-"  Dokumentace:\n"
-"    Základní dokumentace je dostupná v souborech Documentation.txt/.html\n"
+msgid "Support\n"
+msgstr "Podpora\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr "Informace o podpoře naleznete na http://www.phpmyadmin.net/"
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
-msgstr ""
-"  Podpora:\n"
-"    Informace o podpoe naleznete na http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
+msgstr "Užijte si to!\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
-"    Užijte si to!\n"
-"        Tým vývojářů phpMyAdmina\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
+msgstr "Tým vývojářů phpMyAdmina"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Instalace\n"
+#~ "----------------------\n"
+
+#~ msgid ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Čtěte mě\n"
+#~ "=====================\n"
+
+#~ msgid ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+#~ msgstr ""
+#~ "  Verze 3.4.0-dev\n"
+#~ "  ---------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+
+#~ msgid ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\n"
+#~ "    as published by the Free Software Foundation.\n"
+#~ msgstr ""
+#~ "    Tento program je svobodný software; můžete jej šířit a modifikovat "
+#~ "podle\n"
+#~ "    ustanovení GNU General Public License verze 2, vydávané Free "
+#~ "Software\n"
+#~ "    Foundation.\n"
+
+#~ msgid ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ msgstr ""
+#~ "    Tento program je rozšiřován v naději, že bude užitečný, avšak BEZ\n"
+#~ "    JAKÉKOLI ZÁRUKY; neposkytují se ani odvozené záruky PRODEJNOSTI "
+#~ "anebo\n"
+#~ "    VHODNOSTI PRO URČITÝ ÚČEL. Další podrobnosti hledejte ve GNU General\n"
+#~ "    Public License.\n"
+
+#~ msgid ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  "
+#~ "02110-1301  USA\n"
+#~ msgstr ""
+#~ "    Kopii GNU General Public License jste měl obdržet spolu s tímto\n"
+#~ "    programem; pokud se tak nestalo, napište o ni Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 "
+#~ "USA\n"
+
+#~ msgid ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+#~ msgstr ""
+#~ "  Požadavky:\n"
+#~ "    php 5.2 nebo novější\n"
+#~ "    MySQL 5.0 nebo novější\n"
+#~ "    webový prohlížeč (překvapivě!)\n"
+
+#~ msgid ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+#~ msgstr ""
+#~ "  Instalace:\n"
+#~ "    Popis instalace naleznete v souboru Documentation.txt/.html.\n"
+
+#~ msgid ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+#~ msgstr ""
+#~ "  Popis změn:\n"
+#~ "    Popis změn naleznete v souboru ChangeLog\n"
+
+#~ msgid ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+#~ msgstr ""
+#~ "  Dokumentace:\n"
+#~ "    Základní dokumentace je dostupná v souborech Documentation.txt/.html\n"
+
 #~ msgid "$cfg['DBG']['php'] boolean"
 #~ msgstr "$cfg['DBG']['php'] boolean"
 
diff --git a/po/de.po b/po/de.po
index 5d074bd..ec5495b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10133,16 +10133,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -10150,8 +10156,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -12075,203 +12084,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin-Dokumentation"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin-Homepage"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin-Homepage"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Anforderungen"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 kompatibel"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Download"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Information"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "Linked-tables infrastructure"
diff --git a/po/en_GB.po b/po/en_GB.po
index d7579fa..38704f3 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12322,8 +12322,11 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
@@ -12333,8 +12336,11 @@ msgstr ""
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -12346,8 +12352,11 @@ msgstr ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
 "more details."
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -14522,23 +14531,14 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin documentation"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
@@ -14547,74 +14547,69 @@ msgstr ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 "phpMyAdmin - Todo\n"
 "=================\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr "We are currently using the Sourceforge Tracker as Todo list:"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
-msgstr ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin homepage"
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+#, fuzzy
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr "  A set of PHP-scripts to manage MySQL over the web.\n"
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
-msgstr "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
+msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:23
+#, fuzzy, no-wrap
+msgid ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 "    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
@@ -14627,150 +14622,113 @@ msgstr ""
 "                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                            [check Documentation.txt/.html file for more details]\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Requirements"
+
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 compatible"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
+#, fuzzy
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 "  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
+"    phpMyAdmin is intended to handle the administration of MySQL over the "
+"web.\n"
 "    For a summary of features, please see the Documentation.txt/.html file.\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Download"
+
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:54
+#, fuzzy
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 "  Download:\n"
 "    You can get the newest version at http://www.phpmyadmin.net/.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Information"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+#, fuzzy
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
-"  Installation:\n"
+"  Credits:\n"
 "    Please see the Documentation.txt/.html file.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+#, fuzzy
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
-
-#. type: Plain text
-#: ../phpmyadmin/README:62
-#, no-wrap
-msgid ""
 "  Support:\n"
 "    See reference about support forums under http://www.phpmyadmin.net/\n"
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
+#, no-wrap
+msgid "Enjoy!\n"
 msgstr ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 "    Enjoy!\n"
 "        The phpMyAdmin Devel team\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
-#, no-wrap
+#: ../phpmyadmin/README:79
+#, fuzzy, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 "  PS: Please, don't send us e-mails with question like \"How do I compile\n"
 "      PHP with MySQL-support\". We just don't have the time to be your\n"
@@ -14779,6 +14737,93 @@ msgstr ""
 "      Before contacting us, please read the Documentation.html (esp. the\n"
 "      FAQ part).\n"
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+
+#~ msgid ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+
+#~ msgid ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+#~ msgstr ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+
+#~ msgid ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\n"
+#~ "    as published by the Free Software Foundation.\n"
+#~ msgstr ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\n"
+#~ "    as published by the Free Software Foundation.\n"
+
+#~ msgid ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ msgstr ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+
+#~ msgid ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#~ msgstr ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#~ msgid ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+#~ msgstr ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+
+#~ msgid ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+#~ msgstr ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+
+#~ msgid ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+#~ msgstr ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+
+#~ msgid ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+#~ msgstr ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+
 #~ msgid "$cfg['DBG']['php'] boolean"
 #~ msgstr "$cfg['DBG']['php'] boolean"
 
diff --git a/po/es.po b/po/es.po
index f3877b4..73381b1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10046,16 +10046,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -10063,8 +10069,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11991,203 +12000,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentación de phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "Página de inicio de phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Página de inicio de phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Requerimientos"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatible con MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Descargar"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Información"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "Linked-tables infrastructure"
diff --git a/po/fi.po b/po/fi.po
index b514a37..0dea0b8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9598,16 +9598,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9615,8 +9621,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11533,203 +11542,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdminin ohjeet"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdminin verkkosivut"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdminin verkkosivut"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 -yhteensopiva"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Lataa koneelle"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Tiedot"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/fr.po b/po/fr.po
index 2e813ba..cdbcefe 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13196,8 +13196,11 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [consulter les <a href=\"#credits\">crédits</a> pour plus de détails]\n"
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
@@ -13208,8 +13211,11 @@ msgstr ""
 "(Licence publique générale GNU) telle qu'elle est publiée par la Free "
 "Software Foundation (Fondation pour le logiciel libre)."
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -13221,8 +13227,11 @@ msgstr ""
 "UNE UTILISATION PARTICULIÈRE. Voir la GNU General Public License pour plus "
 "de renseignements."
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -15523,99 +15532,85 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentation de phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr "\tVeuillez consulter les fichiers Documentation.txt ou Documentation.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 "phpMyAdmin - Todo\n"
 "=================\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 "Nous utilisons actuellement Sourceforge Tracker pour la liste de choses � "
 "faire :"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
-msgstr ""
-"phpMyAdmin - Lisez-moi\n"
-"======================\n"
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Site de phpMyAdmin"
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+#, fuzzy
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr "  Un ensemble de scripts PHP pour administrer MySQL par Internet.\n"
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
-msgstr "  Un ensemble de scripts PHP pour administrer MySQL par Internet.\n"
+msgid "Version 3.4.0-dev\n"
+msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:23
+#, fuzzy, no-wrap
+msgid ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 "Copyright © 1998-2000   Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "Copyright © 2001-2010   Marc Delisle <marc_at_infomarc.info>\n"
@@ -15628,157 +15623,209 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [consulter le fichier Documentation.txt/html pour plus de détails]\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Prérequis"
+
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
-"    Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier\n"
-"    en respectant les termes de la GNU General Public License version 2 (Licence publique générale GNU) \n"
-"    telle qu'elle est publiée par la Free Software Foundation (Fondation pour le logiciel libre).\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
-"    Ce programme est distribué en espérant être utile, mais SANS AUCUNE GARANTIE; \n"
-"    sans même la garantie implicite COMMERCIALE ou D'ADÉQUATION POUR UNE UTILISATION\n"
-"    PARTICULIÈRE. Voir la GNU General Public License pour plus de renseignements.\n"
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatible MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
-"    Vous devriez avoir reçu une copie de la GNU General Public License\n"
-"    avec ce programme; si ce n'est pas le cas, écrivez à Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
-"  Prérequis :\n"
-"    - php 5.2 ou ultérieur\n"
-"    - MySQL 5.0 ou ultérieur\n"
-"        Remarque : La mise en oeuvre de l'aide pour MySQL 4.1.x et 5.0.x est expérimentale!\n"
-"                   Pour plus de renseignements, voir Documentation.txt / .html\n"
-"    - un navigateur (ben ça alors!)\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
+#, fuzzy
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 "  Résumé :\n"
-"    phpMyAdmin est destiné à la conduite de l'administration de MySQL par l'Internet.\n"
-"    Pour un résumé des fonctionnalités, veuillez consulter le fichier Documentation.fr.txt/.html.\n"
+"    phpMyAdmin est destiné à la conduite de l'administration de MySQL par "
+"l'Internet.\n"
+"    Pour un résumé des fonctionnalités, veuillez consulter le fichier "
+"Documentation.fr.txt/.html.\n"
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Télécharger"
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:54
+#, fuzzy
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 "  Télécharger :\n"
 "    Vous pouvez obtenir la dernière version sur http://www.phpmyadmin.net/.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
-"  Crédits :\n"
-"    Veuillez consulter le fichier Documentation.fr.txt/.html.\n"
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Information"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+#, fuzzy
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
-"  Installation :\n"
+"  Crédits :\n"
 "    Veuillez consulter le fichier Documentation.fr.txt/.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
-"  Journal des changements :\n"
-"    Maintenant dans le fichier ChangeLog\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+#, fuzzy
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
-"  Documentation :\n"
-"    La documentation de base est disponible dans Documentation.fr.txt/.html\n"
+"  Aide :\n"
+"    Voir les indications sur les forums d'aide sur http://www.phpmyadmin."
+"net/\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
-"  Aide :\n"
-"    Voir les indications sur les forums d'aide sur http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 "    Profitez!\n"
 "        L'équipe de développement de phpMyAdmin\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
-#, no-wrap
+#: ../phpmyadmin/README:79
+#, fuzzy, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 "  PS : S'il vous plaît, ne nous envoyez pas de courriels avec des questions du genre \"Comment dois-je compiler\n"
 "       PHP3 avec MySQL\". Nous n'avons vraiment pas le temps d'être votre helpdesk gratuit.\n"
 "       Veuillez envoyer vos questions aux listes de diffusion / forums appropriés.\n"
 "       Avant de nous contacter, veuillez lire le fichier Documentation.html (particulièrement la partie FAQ).\n"
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+
+#~ msgid ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Lisez-moi\n"
+#~ "======================\n"
+
+#~ msgid ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+#~ msgstr ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+
+#~ msgid ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\
n"
+#~ "    as published by the Free Software Foundation.\n"
+#~ msgstr ""
+#~ "    Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier\n"
+#~ "    en respectant les termes de la GNU General Public License version 2 (Licence publique générale GNU) \n"
+#~ "    telle qu'elle est publiée par la Free Software Foundation (Fondation pour le logiciel libre).\n"
+
+#~ msgid ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ msgstr ""
+#~ "    Ce programme est distribué en espérant être utile, mais SANS AUCUNE GARANTIE; \n"
+#~ "    sans même la garantie implicite COMMERCIALE ou D'ADÉQUATION POUR UNE UTILISATION\n"
+#~ "    PARTICULIÈRE. Voir la GNU General Public License pour plus de renseignements.\n"
+
+#~ msgid ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#~ msgstr ""
+#~ "    Vous devriez avoir reçu une copie de la GNU General Public License\n"
+#~ "    avec ce programme; si ce n'est pas le cas, écrivez à Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#~ msgid ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+#~ msgstr ""
+#~ "  Prérequis :\n"
+#~ "    - php 5.2 ou ultérieur\n"
+#~ "    - MySQL 5.0 ou ultérieur\n"
+#~ "        Remarque : La mise en oeuvre de l'aide pour MySQL 4.1.x et 5.0.x est expérimentale!\n"
+#~ "                   Pour plus de renseignements, voir Documentation.txt / .html\n"
+#~ "    - un navigateur (ben ça alors!)\n"
+
+#~ msgid ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+#~ msgstr ""
+#~ "  Installation :\n"
+#~ "    Veuillez consulter le fichier Documentation.fr.txt/.html.\n"
+
+#~ msgid ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+#~ msgstr ""
+#~ "  Journal des changements :\n"
+#~ "    Maintenant dans le fichier ChangeLog\n"
+
+#~ msgid ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+#~ msgstr ""
+#~ "  Documentation :\n"
+#~ "    La documentation de base est disponible dans Documentation.fr.txt/.html\n"
+
 #~ msgid "$cfg['DBG']['php'] boolean"
 #~ msgstr "$cfg['DBG']['php'] boolean"
 
diff --git a/po/gl.po b/po/gl.po
index eec00fb..e7a6611 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9597,16 +9597,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9614,8 +9620,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11532,203 +11541,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentación do phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "Páxina web do phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Páxina web do phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatíbel co MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Descargar"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Información"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/hu.po b/po/hu.po
index d8614ab..4834de1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9598,16 +9598,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9615,8 +9621,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11533,203 +11542,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin dokumentáció"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin honlap"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin honlap"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 kompatibilis"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Letöltés"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Információ"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/hy.po b/po/hy.po
index fbe3f61..f092eea 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -9608,16 +9608,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9625,8 +9631,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11544,203 +11553,171 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Անհրաժեշտ պայմաններ"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/it.po b/po/it.po
index 7ccc74d..5a2016a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11883,16 +11883,22 @@ msgstr ""
 "                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                            [check Documentation.txt/.html file for more details]\n"
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -11900,8 +11906,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -13866,88 +13875,80 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentazione di phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "[7. phpMyAdmin project]"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Documentazione di phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, no-wrap
+#: ../phpmyadmin/README:23
+#, fuzzy, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 "    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
@@ -13960,121 +13961,103 @@ msgstr ""
 "                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                            [check Documentation.txt/.html file for more details]\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Requisiti"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatibile con MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
-msgstr ""
+#: ../phpmyadmin/README:43
+#, fuzzy
+msgid "a web-browser (doh!)"
+msgstr "un browser Web (doh!)."
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Scarica"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informazioni"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "[7. phpMyAdmin project]"
+
+#. type: Plain text
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
 #, fuzzy
 #~ msgid "$cfg['DBG']['php'] boolean"
 #~ msgstr "<b>$cfg['DBG']['enable']</b> boolean"
@@ -14973,9 +14956,6 @@ msgstr ""
 #~ "PHP, inoltre, necessita di essere <span class=\"important\">compilato con "
 #~ "supporto MySQL</span>;"
 
-#~ msgid "a web-browser (doh!)."
-#~ msgstr "un browser Web (doh!)."
-
 #~ msgid "delete, edit and add fields"
 #~ msgstr "rimuovere, modificare ed aggiungere campi"
 
diff --git a/po/ja.po b/po/ja.po
index 7e2d30c..de0be75 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12062,16 +12062,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -12079,8 +12085,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -14030,203 +14039,174 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin のドキュメント"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "[7. phpMyAdmin プロジェクト]"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin のドキュメント"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "必要なもの"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 互換"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:43
+#, fuzzy
+msgid "a web-browser (doh!)"
+msgstr "ウェブブラウザ(そうなんですってば!)"
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "情報"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "[7. phpMyAdmin プロジェクト]"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #, fuzzy
@@ -15232,9 +15212,6 @@ msgstr ""
 #~ "ておくと、ログイン時にとどまらず、phpMyAdmin で行うすべての操作が速くなり"
 #~ "ます。"
 
-#~ msgid "a web-browser (doh!)."
-#~ msgstr "ウェブブラウザ(そうなんですってば!)"
-
 #~ msgid "delete, edit and add fields"
 #~ msgstr "フィールドの削除・修正・追加"
 
diff --git a/po/ka.po b/po/ka.po
index 0eb9333..25a338a 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9598,16 +9598,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9615,8 +9621,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11533,203 +11542,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin-ის დოკუმენტაცია"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin-ის სათაო გვერდი"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin-ის სათაო გვერდი"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0-თან თავსებადი"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "ჩამოტვირთვა"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "ინფორმაცია"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/lt.po b/po/lt.po
index eb9e052..23f754c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9633,16 +9633,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9650,8 +9656,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11570,203 +11579,173 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin dokumentacija"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin tinklalapis"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin tinklalapis"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Reikalavimai"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Suderinamas su MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Parsisiųsti"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informacija"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "Nustatymai phpMyAdmin tobulintojams (kūrėjams)"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/mn.po b/po/mn.po
index 2a8c5db..9c37b28 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -9589,16 +9589,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9606,8 +9612,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11524,203 +11533,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin баримтжилт"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin баримтжилт"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin баримтжилт"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 compatible"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.
txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Мэдээлэл"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/nb.po b/po/nb.po
index fdae126..6f3382b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9598,16 +9598,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9615,8 +9621,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11535,203 +11544,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin-Dokumentasjon"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin hjemmeside"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin hjemmeside"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 kompatibel"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Last ned"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informasjon"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/nl.po b/po/nl.po
index 8c00a09..c75d976 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9753,16 +9753,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9770,8 +9776,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11694,203 +11703,173 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin Documentatie"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin homepage"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin homepage"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Vereisten"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
+# Kan ook vertaald worden als "werkt met ..."
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatibel met MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Download"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informatie"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #, fuzzy
diff --git a/po/pl.po b/po/pl.po
index 6705e54..7672aec 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11502,16 +11502,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -11519,8 +11525,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -13482,203 +13491,174 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Dokumentacja phpMyAdmina"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "[7. projekt phpMyAdmin]"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Strona główna phpMyAdmina"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Wymagania"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Kompatybilny z MySQL-em 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:43
+#, fuzzy
+msgid "a web-browser (doh!)"
+msgstr "przeglądarka (!)."
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Ściągnij"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informacje"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "[7. projekt phpMyAdmin]"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #, fuzzy
@@ -14562,9 +14542,6 @@ msgstr ""
 #~ "<span class=\"important\"> Uwaga: Zaimplementowana obsługa MySQL 4.1."
 #~ "x jest eksperymentalna! </span>"
 
-#~ msgid "a web-browser (doh!)."
-#~ msgstr "przeglądarka (!)."
-
 #~ msgid "delete, edit and add fields"
 #~ msgstr "usuwać, edytować i dodawać pola"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 57c816b..b739fd8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10110,8 +10110,11 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [veja os <a href=\"#credits\">créditos</a> para mais detalhes]\n"
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
@@ -10121,8 +10124,11 @@ msgstr ""
 "sob os termos da GNU General Public License versão 2, conforme publicada "
 "pela Free Software Foundation."
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -10134,8 +10140,11 @@ msgstr ""
 "UM PROPÓSITO PARTICULAR. Veja a GNU General Public License para mais "
 "detalhes."
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -12097,23 +12106,14 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - Instalação\n"
-"-----------------------\n"
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentação do phpMyAdmin "
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
@@ -12122,75 +12122,70 @@ msgstr ""
 "\tPor favor, dê uma olhada nos arquivos \n"
 "\tDocumentation.txt ou Documentation.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 "phpMyAdmin - Tarefas\n"
 "====================\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 "No momento, estamos usando o SourceForge Tracker como lista de tarefas:"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
-msgstr ""
-"phpMyAdmin - Leia-me\n"
-"====================\n"
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Documentação do phpMyAdmin "
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+#, fuzzy
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr "  Um conjunto de scripts PHP para gerenciar o MySQL pela web.\n"
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
-msgstr "  Um conjunto de scripts PHP para gerenciar o MySQL pela web.\n"
+msgid "Version 3.4.0-dev\n"
+msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
-"  Versão 3.4.0-dev\n"
-"  ----------------\n"
-"  http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, no-wrap
+#: ../phpmyadmin/README:23
+#, fuzzy, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 "    Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "    Copyright (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
@@ -12203,150 +12198,113 @@ msgstr ""
 "                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                            [veja o arquivo Documentation.txt/.html para mais detalhes]\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Requisitos"
+
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
-"    Este programa é um software livre; você pode redistribuí-lo\n"
-"    e/ou modificá-lo sob os termos da GNU General Public License\n"
-"    versão 2, conforme publicada pela Free Software Foundation.\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
-"    Este programa é distribuído na esperança de ser útil, mas\n"
-"    SEM QUALQUER GARANTIA; sem mesmo a garantia implícita\n"
-"    de COMERCIABILIDADE ou ADEQUAÇÃO A UM PROPÓSITO\n"
-"    PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatível com MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
-"    Você deve ter recebido uma cópia da GNU General Public License\n"
-"    junto com este programa; se não, escreva para a Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
-"  Requisitos:\n"
-"    php 5.2 ou posterior\n"
-"    MySQL 5.0 ou posterior\n"
-"    um navegador (é claro!)\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
+#, fuzzy
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 "  Resumo:\n"
 "    O phpMyAdmin destina-se a lidar com a administração do MySQL pela web.\n"
-"    Para um resumo das características, consulte o arquivo Documentation.txt/.html.\n"
+"    Para um resumo das características, consulte o arquivo Documentation."
+"txt/.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+msgid "Download\n"
 msgstr ""
-"  Download:\n"
-"    Você pode obter a versão mais nova em http://www.phpmyadmin.net/.\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+#, fuzzy
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
-"  Créditos:\n"
-"    Consulte o arquivo Documentation.txt/.html.\n"
+"  Download:\n"
+"    Você pode obter a versão mais nova em http://www.phpmyadmin.net/.\n"
+
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informação"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+#, fuzzy
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
-"  Instalação:\n"
+"  Créditos:\n"
 "    Consulte o arquivo Documentation.txt/.html.\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
-"  Registro das alterações:\n"
-"    Está em ChangeLog\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+#, fuzzy
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
-"  Documentação:\n"
-"    A documentação está disponível no arquivo Documentation.txt/.html.\n"
+"  Suporte:\n"
+"    Veja a referência sobre fóruns de suporte em http://www.phpmyadmin.net/\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
-"  Suporte:\n"
-"    Veja a referência sobre fóruns de suporte em http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 "    Divirta-se!\n"
 "        A Equipe de Desenvolvimento do phpMyAdmin\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
-#, no-wrap
+#: ../phpmyadmin/README:79
+#, fuzzy, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 "  Obs: Por favor, não nos envie e-mails com perguntas do tipo \"Como faço para\n"
 "       compilar o PHP com suporte a MySQL\". Nós simplesmente não temos tempo\n"
@@ -12355,6 +12313,93 @@ msgstr ""
 "       apropriados. Antes de entrar em contatar conosco, por favor leia o arquivo\n"
 "       Documentation.html (especialmente a parte FAQ).\n"
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Instalação\n"
+#~ "-----------------------\n"
+
+#~ msgid ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Leia-me\n"
+#~ "====================\n"
+
+#~ msgid ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+#~ msgstr ""
+#~ "  Versão 3.4.0-dev\n"
+#~ "  ----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+
+#~ msgid ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\n"
+#~ "    as published by the Free Software Foundation.\n"
+#~ msgstr ""
+#~ "    Este programa é um software livre; você pode redistribuí-lo\n"
+#~ "    e/ou modificá-lo sob os termos da GNU General Public License\n"
+#~ "    versão 2, conforme publicada pela Free Software Foundation.\n"
+
+#~ msgid ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ msgstr ""
+#~ "    Este programa é distribuído na esperança de ser útil, mas\n"
+#~ "    SEM QUALQUER GARANTIA; sem mesmo a garantia implícita\n"
+#~ "    de COMERCIABILIDADE ou ADEQUAÇÃO A UM PROPÓSITO\n"
+#~ "    PARTICULAR. Veja a GNU General Public License para mais detalhes.\n"
+
+#~ msgid ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#~ msgstr ""
+#~ "    Você deve ter recebido uma cópia da GNU General Public License\n"
+#~ "    junto com este programa; se não, escreva para a Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#~ msgid ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+#~ msgstr ""
+#~ "  Requisitos:\n"
+#~ "    php 5.2 ou posterior\n"
+#~ "    MySQL 5.0 ou posterior\n"
+#~ "    um navegador (é claro!)\n"
+
+#~ msgid ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+#~ msgstr ""
+#~ "  Instalação:\n"
+#~ "    Consulte o arquivo Documentation.txt/.html.\n"
+
+#~ msgid ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+#~ msgstr ""
+#~ "  Registro das alterações:\n"
+#~ "    Está em ChangeLog\n"
+
+#~ msgid ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+#~ msgstr ""
+#~ "  Documentação:\n"
+#~ "    A documentação está disponível no arquivo Documentation.txt/.html.\n"
+
 #~ msgid "$cfg['DBG']['php'] boolean"
 #~ msgstr "$cfg['DBG']['php'] booleano"
 
diff --git a/po/ro.po b/po/ro.po
index 6ec9e37..18a39cc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9599,16 +9599,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9616,8 +9622,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11534,203 +11543,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Documentație phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "Documentație phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Documentație phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Compatibil MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Descarcă"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informație"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/sk.po b/po/sk.po
index ed22e96..7afdabd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9593,16 +9593,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9610,8 +9616,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11528,201 +11537,170 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin Dokumentácia"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin Dokumentácia"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin Dokumentácia"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Kompatibilné s MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Stiahnuť súbor"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Informácia"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 33a11f0..bb79f54 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9627,16 +9627,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9644,8 +9650,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11563,203 +11572,181 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "Dokumentacija phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - Namestitev\n"
-"-------------------------\n"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "Domača stran phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "Domača stran phpMyAdmin"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Zahteve"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Združljivo z MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Prenesi"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Podatki"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "Nastavitve za razvijalce phpMyAdmin"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
+
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - Namestitev\n"
+#~ "-------------------------\n"
diff --git a/po/sv.po b/po/sv.po
index 5bfe443..8c3c9f2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9598,16 +9598,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9615,8 +9621,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11533,203 +11542,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin dokumentation"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin:s hemsida"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin:s hemsida"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgst
r ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "Kompatibel med MySQL 4.0"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "Ladda ner"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Information"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/tr.po b/po/tr.po
index d745b5d..195e670 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9684,16 +9684,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9701,8 +9707,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11620,203 +11629,173 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin belgeleri"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin ana sayfası"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin ana sayfası"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "Gereksinimler"
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 uyumlu"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
-msgstr ""
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "İndir"
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "Bilgi"
+
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
-msgstr ""
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
+msgstr "phpMyAdmin geliştiricileri için ayarlar"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d50557..382c64f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10676,8 +10676,11 @@ msgstr ""
 "                        Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                        [更多信息请参见<a href=\"#credits\">鸣谢</a>]\n"
 
+#. #-#-#-#-#  zh_CN-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  zh_CN-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
@@ -10686,8 +10689,11 @@ msgstr ""
 "本软件是自由软件,你可以在自由软件基金会发布的 GNU 通用公共许可协议第 2 版的"
 "许可下重新修改并/或发布。"
 
+#. #-#-#-#-#  zh_CN-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  zh_CN-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -10697,8 +10703,11 @@ msgstr ""
 "本软件因希望能对大家有用而发布,但没有任何担保,也没有任何适销性或针对特定用"
 "途的隐含的担保。参见 GNU 通用公共许可协议获得详细信息。"
 
+#. #-#-#-#-#  zh_CN-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  zh_CN-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -12779,23 +12788,14 @@ msgstr "或者你可以到 https://l10n.cihar.com/projects/pmadoc/ 在线翻译
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr "$Id$"
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
-"phpMyAdmin - 安装\n"
-"-------------------------\n"
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin 文档"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
@@ -12804,74 +12804,69 @@ msgstr ""
 "\t参见 Documentation.txt 或 \n"
 "\tDocumentation.html 文件。\n"
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 "phpMyAdmin - 计划\n"
 "=================\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr "目前我们将 Sourceforge 的追踪器作为计划表使用:"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr "-- swix/20010704"
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
-msgstr ""
-"phpMyAdmin - 说明\n"
-"===================\n"
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin 主页 (外链,英文)"
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+#, fuzzy
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr "  使用 PHP 编写,通过 web 管理 MySQL 的工具。\n"
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
-msgstr "  使用 PHP 编写,通过 web 管理 MySQL 的工具。\n"
+msgid "Version 3.4.0-dev\n"
+msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
-"  版本 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, no-wrap
+#: ../phpmyadmin/README:23
+#, fuzzy, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 "    版权所有 (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>\n"
 "    版权所有 (C) 2001-2010 Marc Delisle <marc_at_infomarc.info>\n"
@@ -12884,149 +12879,112 @@ msgstr ""
 "                            Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n"
 "                            [详细信息请参见 Documentation.txt/.html 文件]\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, fuzzy, no-wrap
+msgid "Requirements\n"
+msgstr "环境需求"
+
 #. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
-"    本软件是自由软件,你可以在自由软件基金会发布的\n"
-"    GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-msgstr ""
-"    本软件因希望能对大家有用而发布,\n"
-"    但没有任何担保,也没有任何适销性\n"
-"    或针对特定用途的隐含的担保。参见\n"
-"    GNU 通用公共许可协议获得详细信息。\n"
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 兼容"
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
-"    你应该在获得此软件的同时收到一份 GNU 通用公共许可协议的副本\n"
-"    如果没有,请致函 Free Software Foundation, Inc.,\n"
-"    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:40
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+msgid "Summary\n"
 msgstr ""
-"  环境需求:\n"
-"    php 5.2 或更高版本\n"
-"    MySQL 5.0 或更高版本\n"
-"    一个网页浏览器\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:44
-#, no-wrap
+#: ../phpmyadmin/README:49
+#, fuzzy
 msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 "  概要:\n"
 "    phpMyAdmin 旨在通过 web 管理 MySQL 。\n"
 "    具体功能请参见 Documentation.txt/.html 文件。\n"
 
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, fuzzy, no-wrap
+msgid "Download\n"
+msgstr "下载"
+
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:54
+#, fuzzy
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 "  下载:\n"
 "    你可以在 http://www.phpmyadmin.net/ 获得最新版本。\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
-msgstr ""
-"  鸣谢:\n"
-"    参见 Documentation.txt/.html 文件。\n"
+#. type: Title ~
+#: ../phpmyadmin/README:56
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "信息"
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:59
+#, fuzzy
+msgid "Please see the Documentation.txt/.html file."
 msgstr ""
-"  安装:\n"
+"  鸣谢:\n"
 "    参见 Documentation.txt/.html 文件。\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:56
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "Support\n"
 msgstr ""
-"  更新记录:\n"
-"    参见 ChangeLog 文件\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:59
-#, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+#: ../phpmyadmin/README:64
+#, fuzzy
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
 msgstr ""
-"  文档:\n"
-"    基本文档参见 Documentation.txt/.html\n"
+"  支持:\n"
+"    参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息\n"
 
-#. type: Plain text
-#: ../phpmyadmin/README:62
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
-"  支持:\n"
-"    参见 http://www.phpmyadmin.net/ 中关于支持论坛的相关信息\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+#, fuzzy
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 "    尽情享受吧!\n"
 "        phpMyAdmin 开发组\n"
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
-#, no-wrap
+#: ../phpmyadmin/README:79
+#, fuzzy, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 "  附: 请勿向我们发送邮件询问诸如 \"怎样编译\n"
 "      支持 MySQL 的 PHP\" 之类的问题。我们\n"
@@ -13034,6 +12992,92 @@ msgstr ""
 "      请将您的问题发送到相应的邮件列表或论坛。\n"
 "      在联系我们之前,请阅读 Documentation.html (特别是 FAQ 部分)。\n"
 
+#~ msgid "$Id$"
+#~ msgstr "$Id$"
+
+#~ msgid ""
+#~ "phpMyAdmin - Installation\n"
+#~ "-------------------------\n"
+#~ msgstr ""
+#~ "phpMyAdmin - 安装\n"
+#~ "-------------------------\n"
+
+#~ msgid ""
+#~ "phpMyAdmin - Readme\n"
+#~ "===================\n"
+#~ msgstr ""
+#~ "phpMyAdmin - 说明\n"
+#~ "===================\n"
+
+#~ msgid ""
+#~ "  Version 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+#~ msgstr ""
+#~ "  版本 3.4.0-dev\n"
+#~ "  -----------------\n"
+#~ "  http://www.phpmyadmin.net/\n"
+
+#~ msgid ""
+#~ "    This program is free software; you can redistribute it and/or modify\n"
+#~ "    it under the terms of the GNU General Public License version 2,\n"
+#~ "    as published by the Free Software Foundation.\n"
+#~ msgstr ""
+#~ "    本软件是自由软件,你可以在自由软件基金会发布的\n"
+#~ "    GNU 通用公共许可协议第 2 版的许可下重新修改并/或发布。\n"
+
+#~ msgid ""
+#~ "    This program is distributed in the hope that it will be useful,\n"
+#~ "    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+#~ "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+#~ "    GNU General Public License for more details.\n"
+#~ msgstr ""
+#~ "    本软件因希望能对大家有用而发布,\n"
+#~ "    但没有任何担保,也没有任何适销性\n"
+#~ "    或针对特定用途的隐含的担保。参见\n"
+#~ "    GNU 通用公共许可协议获得详细信息。\n"
+
+#~ msgid ""
+#~ "    You should have received a copy of the GNU General Public License\n"
+#~ "    along with this program; if not, write to the Free Software\n"
+#~ "    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#~ msgstr ""
+#~ "    你应该在获得此软件的同时收到一份 GNU 通用公共许可协议的副本\n"
+#~ "    如果没有,请致函 Free Software Foundation, Inc.,\n"
+#~ "    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+
+#~ msgid ""
+#~ "  Requirements:\n"
+#~ "    php 5.2 or later\n"
+#~ "    MySQL 5.0 or later\n"
+#~ "    a web-browser (doh!)\n"
+#~ msgstr ""
+#~ "  环境需求:\n"
+#~ "    php 5.2 或更高版本\n"
+#~ "    MySQL 5.0 或更高版本\n"
+#~ "    一个网页浏览器\n"
+
+#~ msgid ""
+#~ "  Installation:\n"
+#~ "    Please see the Documentation.txt/.html file.\n"
+#~ msgstr ""
+#~ "  安装:\n"
+#~ "    参见 Documentation.txt/.html 文件。\n"
+
+#~ msgid ""
+#~ "  ChangeLog:\n"
+#~ "    Now in ChangeLog\n"
+#~ msgstr ""
+#~ "  更新记录:\n"
+#~ "    参见 ChangeLog 文件\n"
+
+#~ msgid ""
+#~ "  Documentation:\n"
+#~ "    Basic documentation available in Documentation.txt/.html\n"
+#~ msgstr ""
+#~ "  文档:\n"
+#~ "    基本文档参见 Documentation.txt/.html\n"
+
 #~ msgid ""
 #~ "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?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 069c62f..90f899a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9591,16 +9591,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  zh_TW-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  zh_TW-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  zh_TW-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  zh_TW-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9608,8 +9614,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  zh_TW-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  zh_TW-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11527,203 +11536,172 @@ msgstr ""
 msgid "-->"
 msgstr "-->"
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
-msgstr ""
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Installation\n"
+msgstr "phpMyAdmin 說明文件"
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
-msgstr ""
+#. type: Title =
+#: ../phpmyadmin/TODO:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Todo\n"
+msgstr "phpMyAdmin 說明文件"
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
+#. type: Title =
+#: ../phpmyadmin/README:2
+#, fuzzy, no-wrap
+msgid "phpMyAdmin - Readme\n"
+msgstr "phpMyAdmin 說明文件"
+
 #. type: Plain text
-#: ../phpmyadmin/README:4
-#, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-msgstr ""
+#: ../phpmyadmin/README:42
+#, fuzzy
+msgid "MySQL 5.0 or later"
+msgstr "MySQL 4.0 相容"
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
-#, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
-msgstr ""
+#, fuzzy, no-wrap
+msgid "More Information\n"
+msgstr "資料"
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
 
 #~ msgid "PO4A-HEADER:mode=before;position=<!-- \\$Id"
diff --git a/pot/ca-full.pot b/pot/ca-full.pot
index d759bdc..f49cc8d 100644
--- a/pot/ca-full.pot
+++ b/pot/ca-full.pot
@@ -20,7 +20,7 @@ msgstr ""
 "#-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -9600,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9617,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ca-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ca-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11535,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ca-txt.pot b/pot/ca-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/ca-txt.pot
+++ b/pot/ca-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/cs-full.pot b/pot/cs-full.pot
index 1cbf31e..659d7c1 100644
--- a/pot/cs-full.pot
+++ b/pot/cs-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  cs-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  cs-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/cs-txt.pot b/pot/cs-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/cs-txt.pot
+++ b/pot/cs-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See r
eference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/de-full.pot b/pot/de-full.pot
index f9303fe..e863857 100644
--- a/pot/de-full.pot
+++ b/pot/de-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  de-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  de-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/de-txt.pot b/pot/de-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/de-txt.pot
+++ b/pot/de-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/en_GB-full.pot b/pot/en_GB-full.pot
index 9e778af..2c7793b 100644
--- a/pot/en_GB-full.pot
+++ b/pot/en_GB-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  en_GB-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  en_GB-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11524,201 +11545,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/en_GB-txt.pot b/pot/en_GB-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/en_GB-txt.pot
+++ b/pot/en_GB-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/es-full.pot b/pot/es-full.pot
index 8c04a1a..66fb0a4 100644
--- a/pot/es-full.pot
+++ b/pot/es-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  es-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  es-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/es-txt.pot b/pot/es-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/es-txt.pot
+++ b/pot/es-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/fi-full.pot b/pot/fi-full.pot
index 6321243..57754ef 100644
--- a/pot/fi-full.pot
+++ b/pot/fi-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  fi-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  fi-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/fi-txt.pot b/pot/fi-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/fi-txt.pot
+++ b/pot/fi-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, 
please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/fr-full.pot b/pot/fr-full.pot
index ed344e6..6af82b3 100644
--- a/pot/fr-full.pot
+++ b/pot/fr-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  fr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  fr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/fr-txt.pot b/pot/fr-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/fr-txt.pot
+++ b/pot/fr-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/gl-full.pot b/pot/gl-full.pot
index 1434973..37bb960 100644
--- a/pot/gl-full.pot
+++ b/pot/gl-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  gl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  gl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/gl-txt.pot b/pot/gl-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/gl-txt.pot
+++ b/pot/gl-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/hu-full.pot b/pot/hu-full.pot
index 6c7783a..12716bc 100644
--- a/pot/hu-full.pot
+++ b/pot/hu-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  hu-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  hu-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/hu-txt.pot b/pot/hu-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/hu-txt.pot
+++ b/pot/hu-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/hy-full.pot b/pot/hy-full.pot
index 65577b3..f042dd5 100644
--- a/pot/hy-full.pot
+++ b/pot/hy-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  hy-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  hy-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/hy-txt.pot b/pot/hy-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/hy-txt.pot
+++ b/pot/hy-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../p
hpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/it-full.pot b/pot/it-full.pot
index 9c5d6a9..87a2a19 100644
--- a/pot/it-full.pot
+++ b/pot/it-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  it-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  it-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/it-txt.pot b/pot/it-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/it-txt.pot
+++ b/pot/it-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ja-full.pot b/pot/ja-full.pot
index 6e6177e..b08eb59 100644
--- a/pot/ja-full.pot
+++ b/pot/ja-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ja-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ja-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ja-txt.pot b/pot/ja-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/ja-txt.pot
+++ b/pot/ja-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ka-full.pot b/pot/ka-full.pot
index 7295867..abd4dea 100644
--- a/pot/ka-full.pot
+++ b/pot/ka-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ka-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ka-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ka-txt.pot b/pot/ka-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/ka-txt.pot
+++ b/pot/ka-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/lt-full.pot b/pot/lt-full.pot
index 6fde06b..af06e1c 100644
--- a/pot/lt-full.pot
+++ b/pot/lt-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  lt-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  lt-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/lt-txt.pot b/pot/lt-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/lt-txt.pot
+++ b/pot/lt-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#
: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/mn-full.pot b/pot/mn-full.pot
index 8a37014..846e803 100644
--- a/pot/mn-full.pot
+++ b/pot/mn-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  mn-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  mn-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/mn-txt.pot b/pot/mn-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/mn-txt.pot
+++ b/pot/mn-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/nb-full.pot b/pot/nb-full.pot
index b15b6e1..cb64ec1 100644
--- a/pot/nb-full.pot
+++ b/pot/nb-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  nb-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  nb-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/nb-txt.pot b/pot/nb-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/nb-txt.pot
+++ b/pot/nb-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/nl-full.pot b/pot/nl-full.pot
index 887c04f..c2650d2 100644
--- a/pot/nl-full.pot
+++ b/pot/nl-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  nl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  nl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/nl-txt.pot b/pot/nl-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/nl-txt.pot
+++ b/pot/nl-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/pl-full.pot b/pot/pl-full.pot
index 16cc823..71a187f 100644
--- a/pot/pl-full.pot
+++ b/pot/pl-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  pl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  pl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/pl-txt.pot b/pot/pl-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/pl-txt.pot
+++ b/pot/pl-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free hel
pdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/pt_BR-full.pot b/pot/pt_BR-full.pot
index 5f34aff..ab75bfd 100644
--- a/pot/pt_BR-full.pot
+++ b/pot/pt_BR-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  pt_BR-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  pt_BR-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11524,201 +11545,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/pt_BR-txt.pot b/pot/pt_BR-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/pt_BR-txt.pot
+++ b/pot/pt_BR-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ro-full.pot b/pot/ro-full.pot
index 9254af7..a801749 100644
--- a/pot/ro-full.pot
+++ b/pot/ro-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  ro-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  ro-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/ro-txt.pot b/pot/ro-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/ro-txt.pot
+++ b/pot/ro-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sk-full.pot b/pot/sk-full.pot
index b5f415e..01cef31 100644
--- a/pot/sk-full.pot
+++ b/pot/sk-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sk-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sk-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sk-txt.pot b/pot/sk-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/sk-txt.pot
+++ b/pot/sk-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sl-full.pot b/pot/sl-full.pot
index a8e1542..6d99fcc 100644
--- a/pot/sl-full.pot
+++ b/pot/sl-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:40+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sl-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sl-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sl-txt.pot b/pot/sl-txt.pot
index 3db9c5c..d5bce8f 100644
--- a/pot/sl-txt.pot
+++ b/pot/sl-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:40+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "D
ownload\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sv-full.pot b/pot/sv-full.pot
index 531921a..fd96085 100644
--- a/pot/sv-full.pot
+++ b/pot/sv-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  sv-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  sv-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/sv-txt.pot b/pot/sv-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/sv-txt.pot
+++ b/pot/sv-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/tr-full.pot b/pot/tr-full.pot
index f508f76..c1e24b4 100644
--- a/pot/tr-full.pot
+++ b/pot/tr-full.pot
@@ -6,6 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
+"#-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2010-09-07 14:39+0300\n"
@@ -16,6 +17,17 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: phpMyAdmin documentation VERSION\n"
+"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <html><head><title>
 #: ../phpmyadmin/Documentation.html:13
@@ -9588,16 +9600,22 @@ msgid ""
 "                        [check <a href=\"#credits\">credits</a> for more details]\n"
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4577
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4577 ../phpmyadmin/README:27
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License version 2, as published by "
 "the Free Software Foundation."
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4583
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4583 ../phpmyadmin/README:32
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
@@ -9605,8 +9623,11 @@ msgid ""
 "more details."
 msgstr ""
 
+#. #-#-#-#-#  tr-html.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
 #. type: Content of: <html><body><div><p>
-#: ../phpmyadmin/Documentation.html:4590
+#. #-#-#-#-#  tr-txt.pot (phpMyAdmin documentation VERSION)  #-#-#-#-#
+#. type: Plain text
+#: ../phpmyadmin/Documentation.html:4590 ../phpmyadmin/README:36
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
@@ -11523,201 +11544,169 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:7
-#, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:11
+#. type: Title -
+#: ../phpmyadmin/README:7
 #, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
-#, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson <robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:26
+#: ../phpmyadmin/README:23
 #, no-wrap
 msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:38
+#, no-wrap
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
-msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
-msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
-msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the web.\n"
-"    For a summary of features, please see the Documentation.txt/.html file.\n"
+msgid "Summary\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
+#: ../phpmyadmin/README:49
 msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:50
+#. type: Title ~
+#: ../phpmyadmin/README:51
 #, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
-#, no-wrap
-msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
 msgstr ""
 
-#. type: Plain text
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"    Please, don't send us emails with question like \"How do I compile\n"
+"    PHP with MySQL-support\". We just don't have the time to be your\n"
+"    free helpdesk.\n"
+"    Please send your questions to the appropriate mailinglists / forums.\n"
+"    Before contacting us, please read the Documentation.html (esp. the\n"
+"    FAQ part).\n"
 msgstr ""
diff --git a/pot/tr-txt.pot b/pot/tr-txt.pot
index 9285892..d5bce8f 100644
--- a/pot/tr-txt.pot
+++ b/pot/tr-txt.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin documentation VERSION\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2010-09-07 14:39+0300\n"
+"POT-Creation-Date: 2010-09-07 15:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -42,207 +42,194 @@ msgstr ""
 msgid "-->"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:2 ../phpmyadmin/TODO:2 ../phpmyadmin/README:2
-msgid "$Id$"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/INSTALL:4
+#. type: Title -
+#: ../phpmyadmin/INSTALL:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Installation\n"
-"-------------------------\n"
+msgid "phpMyAdmin - Installation\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/INSTALL:8
+#: ../phpmyadmin/INSTALL:6
 #, no-wrap
 msgid ""
 "\tPlease have a look to the Documentation.txt or \n"
 "\tDocumentation.html files.\n"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/TODO:4
+#. type: Title =
+#: ../phpmyadmin/TODO:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Todo\n"
-"=================\n"
+msgid "phpMyAdmin - Todo\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:7
+#: ../phpmyadmin/TODO:5
 msgid "We are currently using the Sourceforge Tracker as Todo list:"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:9
+#: ../phpmyadmin/TODO:7
 #, no-wrap
 msgid "  http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/TODO:10
+#: ../phpmyadmin/TODO:8
 msgid "-- swix/20010704"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:4
+#. type: Title =
+#: ../phpmyadmin/README:2
 #, no-wrap
-msgid ""
-"phpMyAdmin - Readme\n"
-"===================\n"
+msgid "phpMyAdmin - Readme\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:5
+msgid "A set of PHP-scripts to manage MySQL over the web."
+msgstr ""
+
+#. type: Title -
 #: ../phpmyadmin/README:7
 #, no-wrap
-msgid "  A set of PHP-scripts to manage MySQL over the web.\n"
+msgid "Version 3.4.0-dev\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:11
-#, no-wrap
-msgid ""
-"  Version 3.4.0-dev\n"
-"  -----------------\n"
-"  http://www.phpmyadmin.net/\n"
+#: ../phpmyadmin/README:10
+msgid "http://www.phpmyadmin.net/"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:22
+#: ../phpmyadmin/README:23
 #, 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"
-"                            Olivier Müller <om_at_omnis.ch>\n"
-"                            Robin Johnson "
-"<robbat2_at_users.sourceforge.net>\n"
-"                            Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more "
-"details]\n"
-msgstr ""
-
-#. type: Plain text
-#: ../phpmyadmin/README:26
-#, no-wrap
-msgid ""
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License version 2,\n"
-"    as published by the Free Software Foundation.\n"
+"Copyright (C) 1998-2000 \n"
+"    Tobias Ratschiller <tobias_at_ratschiller.com>\n"
+"Copyright (C) 2001-2010 \n"
+"    Marc Delisle <marc_at_infomarc.info>\n"
+"    Olivier Müller <om_at_omnis.ch>\n"
+"    Robin Johnson <robbat2_at_users.sourceforge.net>\n"
+"    Alexander M. Turek <me_at_derrabus.de>\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 Documentation.txt/.html file for more details]\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:31
-#, no-wrap
+#: ../phpmyadmin/README:27
 msgid ""
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License version 2, as published by "
+"the Free Software Foundation."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:35
-#, no-wrap
+#: ../phpmyadmin/README:32
 msgid ""
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  "
-"USA\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:40
-#, no-wrap
+#: ../phpmyadmin/README:36
 msgid ""
-"  Requirements:\n"
-"    php 5.2 or later\n"
-"    MySQL 5.0 or later\n"
-"    a web-browser (doh!)\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 msgstr ""
 
-#. type: Plain text
-#: ../phpmyadmin/README:44
+#. type: Title ~
+#: ../phpmyadmin/README:38
 #, no-wrap
-msgid ""
-"  Summary:\n"
-"    phpMyAdmin is intended to handle the administration of MySQL over the "
-"web.\n"
-"    For a summary of features, please see the Documentation.txt/.html "
-"file.\n"
+msgid "Requirements\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:47
-#, no-wrap
-msgid ""
-"  Download:\n"
-"    You can get the newest version at http://www.phpmyadmin.net/.\n"
+#: ../phpmyadmin/README:41
+msgid "PHP 5.2 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:50
-#, no-wrap
-msgid ""
-"  Credits:\n"
-"    Please see the Documentation.txt/.html file.\n"
+#: ../phpmyadmin/README:42
+msgid "MySQL 5.0 or later"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:53
+#: ../phpmyadmin/README:43
+msgid "a web-browser (doh!)"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:45
 #, no-wrap
+msgid "Summary\n"
+msgstr ""
+
+#. type: Plain text
+#: ../phpmyadmin/README:49
 msgid ""
-"  Installation:\n"
-"    Please see the Documentation.txt/.html file.\n"
+"phpMyAdmin is intended to handle the administration of MySQL over the web.  "
+"For a summary of features, please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:51
+#, no-wrap
+msgid "Download\n"
 msgstr ""
 
 #. type: Plain text
+#: ../phpmyadmin/README:54
+msgid "You can get the newest version at http://www.phpmyadmin.net/."
+msgstr ""
+
+#. type: Title ~
 #: ../phpmyadmin/README:56
 #, no-wrap
-msgid ""
-"  ChangeLog:\n"
-"    Now in ChangeLog\n"
+msgid "More Information\n"
 msgstr ""
 
 #. type: Plain text
 #: ../phpmyadmin/README:59
+msgid "Please see the Documentation.txt/.html file."
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:61
 #, no-wrap
-msgid ""
-"  Documentation:\n"
-"    Basic documentation available in Documentation.txt/.html\n"
+msgid "Support\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:62
+#: ../phpmyadmin/README:64
+msgid "See reference about support forums under http://www.phpmyadmin.net/"
+msgstr ""
+
+#. type: Title ~
+#: ../phpmyadmin/README:67
 #, no-wrap
-msgid ""
-"  Support:\n"
-"    See reference about support forums under http://www.phpmyadmin.net/\n"
+msgid "Enjoy!\n"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:66
-#, no-wrap
-msgid ""
-"    Enjoy!\n"
-"        The phpMyAdmin Devel team\n"
+#: ../phpmyadmin/README:70
+msgid "The phpMyAdmin Devel team"
 msgstr ""
 
 #. type: Plain text
-#: ../phpmyadmin/README:74
+#: ../phpmyadmin/README:79
 #, no-wrap
 msgid ""
-"  PS: Please, don't send us emails with question like \"How do I compile\n"
-"      PHP with MySQL-support\". We just don't have the time to be your\n"
-"      free helpdesk.\n"
-"      Please send your questions to the appropriate mailinglists / forums.\n"
-"      Before contacting us, please read the Documentation.html (esp. the\n"
-"      FAQ part).\n"
+"PS: \n"
+"