merge updated translations from l10n

This includes an (almost) up-to-date French basewiki translation.

55 files changed, 3225 insertions, 2039 deletions

diff --git a/po/underlays/basewiki/ikiwiki.cs.po b/po/underlays/basewiki/ikiwiki.cs.po
index 2584af2a6..39bd065b7 100644
--- a/po/underlays/basewiki/ikiwiki.cs.po
+++ b/po/underlays/basewiki/ikiwiki.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-16 16:29+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[vyhledávání|ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index 74f11980c..fb394aec3 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,3 +73,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[søgning|ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po
index 1eb8429f3..692800e39 100644
--- a/po/underlays/basewiki/ikiwiki.de.po
+++ b/po/underlays/basewiki/ikiwiki.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 09:37+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,6 @@ msgstr "[[ikiwiki/openid]]"
 msgid "[[ikiwiki/searching]]"
 msgstr "[[Suchen|ikiwiki/searching]]"
 
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.es.po b/po/underlays/basewiki/ikiwiki.es.po
index f6c1eb3c9..cec554808 100644
--- a/po/underlays/basewiki/ikiwiki.es.po
+++ b/po/underlays/basewiki/ikiwiki.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki \n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-16 20:19+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -69,3 +70,6 @@ msgstr "[[ikiwiki/openid]]"
 msgid "[[ikiwiki/searching]]"
 msgstr "[[Búsqueda|ikiwiki/searching]]"
 
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
index 6fceab6f2..5516a95e0 100644
--- a/po/underlays/basewiki/ikiwiki.fr.po
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-30 09:46+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,3 +68,7 @@ msgstr "[[ikiwiki/openid]]"
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr "[[ikiwiki/searching]]"
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/formatting.es.po b/po/underlays/basewiki/ikiwiki/formatting.es.po
index e8efac5b5..5e2549b8c 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.es.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2009-12-10 22:00-0500\n"
 "PO-Revision-Date: 2009-08-18 20:20+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
@@ -41,9 +41,6 @@ msgid "Leave blank lines between paragraphs."
 msgstr "Deje líneas vacías entre párrafos."
 
 #. type: Plain text
-#| msgid ""
-#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-#| "placing it in single or double asterisks."
 msgid ""
 "You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
@@ -296,4 +293,3 @@ msgstr "  Lista completa de [[directivas|directive]] activadas en este wiki:\n"
 #, no-wrap
 msgid "  [[!listdirectives ]]\n"
 msgstr "  [[!listdirectives ]]\n"
-
diff --git a/po/underlays/basewiki/ikiwiki/openid.cs.po b/po/underlays/basewiki/ikiwiki/openid.cs.po
index 6cc5f7126..d3de65d34 100644
--- a/po/underlays/basewiki/ikiwiki/openid.cs.po
+++ b/po/underlays/basewiki/ikiwiki/openid.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-22 09:00+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,46 +48,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"Pro získání OpenID navštivte některého z následujících poskytovatelů identit:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"nebo některého [z mnoha dalších](http://openiddirectory.com/openid-providers-"
-"c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Vaše OpenID je URL, které jste získali, když jste se zaregistrovali.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -114,3 +84,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://vase-id.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Pro získání OpenID navštivte některého z následujících poskytovatelů "
+#~ "identit:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "nebo některého [z mnoha dalších](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Vaše OpenID je URL, které jste získali, když jste se zaregistrovali.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.da.po b/po/underlays/basewiki/ikiwiki/openid.da.po
index 7f030eef0..cb051192d 100644
--- a/po/underlays/basewiki/ikiwiki/openid.da.po
+++ b/po/underlays/basewiki/ikiwiki/openid.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,47 +53,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"Du kan registrere en OpenID ved at besøge en af de følgende "
-"identitetsudbydere:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Din OpenID er den URL som du får når du registrerer dig.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -121,3 +90,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Du kan registrere en OpenID ved at besøge en af de følgende "
+#~ "identitetsudbydere:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Din OpenID er den URL som du får når du registrerer dig.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po
index 27c74679a..9669a8706 100644
--- a/po/underlays/basewiki/ikiwiki/openid.de.po
+++ b/po/underlays/basewiki/ikiwiki/openid.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 22:29+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,43 +46,16 @@ msgstr ""
 "einer wachsenden Anzahl von Webseiten anzumelden."
 
 #. type: Plain text
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-"Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
 msgid ""
-"or any of the [many others out "
-"there](http://openiddirectory.com/openid-providers-c-1.html)"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"oder einem der [vielen anderen](http://openiddirectory."
-"com/openid-providers-c-1.html)."
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter "
-"erhält.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -99,9 +73,9 @@ msgid ""
 "It's also possible to make a page in the wiki usable as an OpenID url, by "
 "delegating it to an openid server. Here's an example of how to do that:"
 msgstr ""
-"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar zu "
-"machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist ein "
-"Beispiel, wie dies gemacht wird:"
+"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar "
+"zu machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist "
+"ein Beispiel, wie dies gemacht wird:"
 
 #. type: Plain text
 #, no-wrap
@@ -112,4 +86,33 @@ msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
 
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "oder einem der [vielen anderen](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)."
 
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter erhält.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
diff --git a/po/underlays/basewiki/ikiwiki/openid.es.po b/po/underlays/basewiki/ikiwiki/openid.es.po
index 4a2f19d60..57d48841b 100644
--- a/po/underlays/basewiki/ikiwiki/openid.es.po
+++ b/po/underlays/basewiki/ikiwiki/openid.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-19 18:53+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,50 +43,21 @@ msgid ""
 "allows you to have one login that you can use on a growing number of "
 "websites."
 msgstr ""
-"[OpenID](http://openid.net) es un mecanismo descentralizado de identificación que "
-"le permite tener un acceso («login») que puede usar en un número creciente de "
-"sitios web."
+"[OpenID](http://openid.net) es un mecanismo descentralizado de "
+"identificación que le permite tener un acceso («login») que puede usar en un "
+"número creciente de sitios web."
 
 #. type: Plain text
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr "Para solicitar un OpenID, visite a alguno de los proveedores de identidad siguientes:"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
 msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
-"o cualquier de los [muchos otros que existen](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Su OpenID es el URL que se le proporciona al registrarse.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -93,10 +65,10 @@ msgid ""
 "the signin form. You do not need to give this wiki a password or go through "
 "any registration process when using OpenID."
 msgstr ""
-"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en el "
-"Campo OpenID del formulario de identificación. Si usa OpenID, no es necesario "
-"que proporcione ninguna contraseña a este wiki, ni que realice ningún proceso "
-"de registro."
+"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en "
+"el Campo OpenID del formulario de identificación. Si usa OpenID, no es "
+"necesario que proporcione ninguna contraseña a este wiki, ni que realice "
+"ningún proceso de registro."
 
 #. type: Plain text
 msgid ""
@@ -115,3 +87,37 @@ msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
 
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Para solicitar un OpenID, visite a alguno de los proveedores de identidad "
+#~ "siguientes:"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "o cualquier de los [muchos otros que existen](http://openiddirectory.com/"
+#~ "openid-providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Su OpenID es el URL que se le proporciona al registrarse.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 81d36e068..2f41cf76c 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-25 09:52+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -46,47 +47,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-"Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs d'identité "
-"suivants :"
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr "[GetOpenID](https://getopenid.com/)"
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr "[Videntity](http://videntity.org/)"
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#. type: Bullet: '* '
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)"
-msgstr ""
-"ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
+msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
-"Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -116,3 +85,38 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
+
+#~ msgid ""
+#~ "To sign up for an OpenID, visit one of the following identity providers:"
+#~ msgstr ""
+#~ "Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs "
+#~ "d'identité suivants :"
+
+#~ msgid "[MyOpenID](https://www.myopenid.com/)"
+#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
+
+#~ msgid "[GetOpenID](https://getopenid.com/)"
+#~ msgstr "[GetOpenID](https://getopenid.com/)"
+
+#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
+#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
+
+#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
+#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
+
+#~ msgid ""
+#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
+#~ "providers-c-1.html)"
+#~ msgstr ""
+#~ "ou n'importe lequel des [nombreux autres fournisseurs existants](http://"
+#~ "openiddirectory.com/openid-providers-c-1.html)"
+
+#~ msgid ""
+#~ "Your OpenID is the URL that you are given when you sign up.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+#~ msgstr ""
+#~ "Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n"
+#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+
+#~ msgid "[Videntity](http://videntity.org/)"
+#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.cs.po b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
index d59e7dd28..0ed80b952 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 14:14+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -82,113 +83,41 @@ msgid ""
 "functions:"
 msgstr "S komplikovanějšími výběry mohou pomoci následující funkce:"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"„`link(stránka)`“ - vybere stránky, které odkazují na danou stránku (resp. "
-"stránky, pokud použijete zástupné znaky)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"„`tagged(štítek)`“ - vybere stránky, které obsahují daný štítek (resp. "
-"štítky, pokud použijete zástupné znaky), nebo na něj odkazují"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"„`backlink(stránka)`“ - vybere pouze stránky, na které odkazuje daná stránka"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"„`creation_month(měsíc)`“ - vybere pouze stránky vytvořené v daném měsíci"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr ""
-"„`creation_day(den_měsíce)`“ - vybere pouze stránky vytvořené daného dne v "
-"měsíci"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "„`creation_year(rok)`“ - vybere pouze stránky vytvořené v daném roce"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"„`created_after(stránka)`“ - vybere pouze stránky vytvořené po vytvoření "
-"dané stránky"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"„`created_before(stránka)`“ - vybere pouze stránky vytvořené před vytvořením "
-"dané stránky"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"„`glob(vzor)`“ - vybere stránky, které odpovídají danému vzoru. Použití "
-"samotného vzoru je zkratkou za tuto funkci."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"„`internal(vzor)`“ - jako `glob()`, ale vybere i stránky pro interní "
-"potřebu, které glob() obvykle přeskočí."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"„`title(vzor)`“, „`author(vzor)`“, „`authorurl(vzor)`“, „`license(vzor)`“, "
-"„`copyright(vzor)`“ - vybere stránky, které obsahují metadata odpovídající "
-"zadanému vzoru."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"„`user(uživatelskéjméno)`“ - testuje, zda změnu provádí uživatel s daným "
-"uživatelským jménem. Je-li povoleno openid, můžete ho použít místo "
-"uživatelského jména."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr "„`admin()`“ - testuje, zda změnu provádí některý ze správců wiki."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr "„`ip(adresa)`“ - testuje, zda změnu provádí někdo z dané IP adresy."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"„`postcomment(vzor)`“ - shoduje se pouze pokud se komentáře ukládají do "
-"stránky odpovídající zadanému vzoru"
 
 #. type: Plain text
 msgid ""
@@ -245,3 +174,105 @@ msgstr ""
 "„a/b/něco“. Chcete-li vyhledávat relativně k adresáři stránky, která "
 "obsahuje PageSpec, můžete použít „./“. To znamená, že „./něco“ na stránce „a/"
 "b“ najde stránku „a/něco“."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "„`link(stránka)`“ - vybere stránky, které odkazují na danou stránku "
+#~ "(resp. stránky, pokud použijete zástupné znaky)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "„`tagged(štítek)`“ - vybere stránky, které obsahují daný štítek (resp. "
+#~ "štítky, pokud použijete zástupné znaky), nebo na něj odkazují"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "„`backlink(stránka)`“ - vybere pouze stránky, na které odkazuje daná "
+#~ "stránka"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "„`creation_month(měsíc)`“ - vybere pouze stránky vytvořené v daném měsíci"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr ""
+#~ "„`creation_day(den_měsíce)`“ - vybere pouze stránky vytvořené daného dne "
+#~ "v měsíci"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr ""
+#~ "„`creation_year(rok)`“ - vybere pouze stránky vytvořené v daném roce"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "„`created_after(stránka)`“ - vybere pouze stránky vytvořené po vytvoření "
+#~ "dané stránky"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "„`created_before(stránka)`“ - vybere pouze stránky vytvořené před "
+#~ "vytvořením dané stránky"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "„`glob(vzor)`“ - vybere stránky, které odpovídají danému vzoru. Použití "
+#~ "samotného vzoru je zkratkou za tuto funkci."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "„`internal(vzor)`“ - jako `glob()`, ale vybere i stránky pro interní "
+#~ "potřebu, které glob() obvykle přeskočí."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "„`title(vzor)`“, „`author(vzor)`“, „`authorurl(vzor)`“, „`license(vzor)"
+#~ "`“, „`copyright(vzor)`“ - vybere stránky, které obsahují metadata "
+#~ "odpovídající zadanému vzoru."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "„`user(uživatelskéjméno)`“ - testuje, zda změnu provádí uživatel s daným "
+#~ "uživatelským jménem. Je-li povoleno openid, můžete ho použít místo "
+#~ "uživatelského jména."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr "„`admin()`“ - testuje, zda změnu provádí některý ze správců wiki."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr "„`ip(adresa)`“ - testuje, zda změnu provádí někdo z dané IP adresy."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "„`postcomment(vzor)`“ - shoduje se pouze pokud se komentáře ukládají do "
+#~ "stránky odpovídající zadanému vzoru"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index f3bfd572f..42d05c78d 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,8 +59,8 @@ msgid ""
 "does not match the SandBox itself:"
 msgstr ""
 "Mere hyppigt har du dog brug for at passe for sider med noget bestemt i "
-"deres navne. Dette kan du udtrykke med et \"glob-mønster\". \"`*`\" står "
-"for enhver del af et sidenavn, og \"`?`\" for ethvert enkeltbogstav i et "
+"deres navne. Dette kan du udtrykke med et \"glob-mønster\". \"`*`\" står for "
+"enhver del af et sidenavn, og \"`?`\" for ethvert enkeltbogstav i et "
 "sidenavn. Så dette passer for alle sider om musik, og alle [[UnderSider||"
 "SubPage]] til sandkassen, men ikke selve sandkasse-siden:"
 
@@ -86,115 +87,41 @@ msgid ""
 "functions:"
 msgstr "Resultaterne kan begrænses mere nuanceret med disse funktioner:"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(side)`\" - passer kun for sider som henviser til en given side "
-"(eller glob)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(mærkat)`\" - passer for sider mærket af med eller som henviser til "
-"den givne mærkat (eller mærkater som passer for et glob)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(side)`\" - passer kun for sider som en given side henviser til"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"\"`creation_month(måned)`\" - passer kun for sider oprettet den givne måned"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(månedsdag)`\" - eller dag på måneden"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(år)`\" - eller år"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(side)`\" - passer kun for sider oprettet efter den givne "
-"side blev oprettet"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(side)`\" - passer kun for sider oprettet før den givne "
-"side blev oprettet"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(nogetglob)`\" - passer for sider som passer for det givne glob. Blot "
-"at skrive glob'et alene er faktisk en genvej til denne funktion."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - lissom `glob()`, men passer også for internt anvendte "
-"sider som glob normalt ikke passer for."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - passer for sider med de givne metadata, "
-"som passer for det angivne glob."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"\"`user(brugernavn)`\" - tester hvorvidt en ændring foretages af en bruger "
-"med det angivne  brugernavn. Hvis openid er aktiveret, kan en openid også "
-"bruges her."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - tester hvorvidt en ændring foretages af en af wiki-"
-"administratorerne."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(adresse)`\" - tester hvorvidt en ændring foretages fra den angivne IP-"
-"adresse."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - passer kun når kommentarer er blevet indsendt "
-"til en side som passer for det angivne glob"
 
 #. type: Plain text
 msgid ""
@@ -251,3 +178,106 @@ msgstr ""
 "passe for siderne navngivet \"a/foo\" eller \"a/b/foo\". For at afstemme "
 "relativt til samme mappe som siden der indeholder pagespec'et kan du bruge "
 "\"./\". Eksempelvis passer \"./foo\" på siden \"a/b\" for siden \"a/foo\"."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(side)`\" - passer kun for sider som henviser til en given side "
+#~ "(eller glob)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(mærkat)`\" - passer for sider mærket af med eller som henviser "
+#~ "til den givne mærkat (eller mærkater som passer for et glob)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(side)`\" - passer kun for sider som en given side henviser til"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(måned)`\" - passer kun for sider oprettet den givne "
+#~ "måned"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(månedsdag)`\" - eller dag på måneden"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(år)`\" - eller år"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(side)`\" - passer kun for sider oprettet efter den givne "
+#~ "side blev oprettet"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(side)`\" - passer kun for sider oprettet før den givne "
+#~ "side blev oprettet"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(nogetglob)`\" - passer for sider som passer for det givne glob. "
+#~ "Blot at skrive glob'et alene er faktisk en genvej til denne funktion."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - lissom `glob()`, men passer også for internt "
+#~ "anvendte sider som glob normalt ikke passer for."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - passer for sider med de givne "
+#~ "metadata, som passer for det angivne glob."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(brugernavn)`\" - tester hvorvidt en ændring foretages af en "
+#~ "bruger med det angivne  brugernavn. Hvis openid er aktiveret, kan en "
+#~ "openid også bruges her."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - tester hvorvidt en ændring foretages af en af wiki-"
+#~ "administratorerne."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(adresse)`\" - tester hvorvidt en ændring foretages fra den angivne "
+#~ "IP-adresse."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - passer kun når kommentarer er blevet indsendt "
+#~ "til en side som passer for det angivne glob"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po
index 401b4f4b7..4fd1da8e9 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:39+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,19 +25,18 @@ msgid ""
 "emails you want subscribe to, or pages to combine into a blog, the wiki uses "
 "a PageSpec. This is an expression that matches a set of pages."
 msgstr ""
-"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden sollen, "
-"deren Einrechungs-Mails man abonnieren will, oder die man zu einem Blog "
-"kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein Ausdruck, "
-"der auf bestimmte Seiten passt."
+"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden "
+"sollen, deren Einrechungs-Mails man abonnieren will, oder die man zu einem "
+"Blog kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein "
+"Ausdruck, der auf bestimmte Seiten passt."
 
 #. type: Plain text
 msgid ""
 "The simplest PageSpec is a simple list of pages. For example, this matches "
 "any of the three listed pages:"
 msgstr ""
-"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel passt "
-"dies "
-"auf jede der drei aufgezählten Seiten:"
+"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel "
+"passt dies auf jede der drei aufgezählten Seiten:"
 
 #. type: Plain text
 #, no-wrap
@@ -53,9 +53,10 @@ msgid ""
 msgstr ""
 "Häufiger wird es vorkommen, dass man Seiten erfassen will, deren Name etwas "
 "bestimmtes enthält. Man kann dies mit einem Muster tun: \"`*`\" steht für "
-"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen beliebigen "
-"Buchstaben eines Seitennamens. Also passt dies alle Seiten über Musik, und alle "
-"[[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den Sandkasten selbst:"
+"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen "
+"beliebigen Buchstaben eines Seitennamens. Also passt dies alle Seiten über "
+"Musik, und alle [[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den "
+"Sandkasten selbst:"
 
 #. type: Plain text
 #, no-wrap
@@ -68,8 +69,8 @@ msgid ""
 "match all pages except for Discussion pages and the SandBox:"
 msgstr ""
 "Man kann einem Eintrag ein \"`!`\" voranstellen, um die betreffenden Seiten "
-"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten und "
-"Sandkasten erfasst werden:"
+"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten "
+"und Sandkasten erfasst werden:"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -83,127 +84,49 @@ msgstr ""
 "Einige weitergehende Einschränkungen können hinzugefügt werden, indem die "
 "folgenden Funktionen verwendet werden:"
 
-#. type: Bullet: '* '
-msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die angegebene Seite "
-"(oder das angegebene Muster) enthalten"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag versehen "
-"sind oder auf diesen verweisen (auch hier kann ein Muster verwendet werden)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen Seite "
-"verwiesen wird"
-
-#. type: Bullet: '* '
-msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr ""
-"\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen Monat "
-"erstellt wurden"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(year)`\" - der ein Jahr"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(page)`\" - passt nur auf Seiten, die nach der angegebenen Seite "
-"angelegt wurden"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(page)`\" - passt nur auf Seiten, die vor der angegebenen Seite "
-"angelegt wurden."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene Muster passt."
-" "
-"Das Muster direkt anzugeben ist eine Abkürzung für diese Funktion."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern verwendete "
-"Seiten "
-"erfasst, auf die normale Muster nicht passen."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
-"metadata, matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten "
-"auf die angegebenen Muster passen."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here. Glob patterns can be used in the username. For example, to match all "
-"openid users, use `user(*://*)`"
-msgstr ""
-"\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem "
-"angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine "
-"OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. "
-"zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-Administratoren "
-"gemacht wird."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse aus "
-"gemacht wird."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch das "
-"Muster angegebenen Seite gemacht wird"
 
 #. type: Plain text
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
-"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen Link "
-"zu einer Seite über Musik enthalten und 2005 geschrieben wurden:"
+"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen "
+"Link zu einer Seite über Musik enthalten und 2005 geschrieben wurden:"
 
 #. type: Plain text
 #, no-wrap
@@ -218,12 +141,11 @@ msgid ""
 "to match one expression. Note that it doesn't make sense to say \"index and "
 "SandBox\", since no page can match both expressions."
 msgstr ""
-"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass "
-"nur die Seiten auf den gesamten Ausdruck passen, die auf alle drei "
-"Teilausdrücke passen. Verwende `and` um Ausdrücke so zu kombinieren "
-"und `or` wenn eine Seite nur auf einen der Ausdrücke passen soll. Beachte "
-"dass es sinnlos ist, `index and SandBox` zu sagen, da keine Seite auf beide "
-"Ausdrücke passen kann."
+"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass nur "
+"die Seiten auf den gesamten Ausdruck passen, die auf alle drei Teilausdrücke "
+"passen. Verwende `and` um Ausdrücke so zu kombinieren und `or` wenn eine "
+"Seite nur auf einen der Ausdrücke passen soll. Beachte dass es sinnlos ist, "
+"`index and SandBox` zu sagen, da keine Seite auf beide Ausdrücke passen kann."
 
 #. type: Plain text
 msgid ""
@@ -231,10 +153,9 @@ msgid ""
 "grouping. For example, to match pages in a blog that are tagged with either "
 "of two tags, use:"
 msgstr ""
-"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern "
-"zur Gruppierung verwendet werden. Zum Beispiel passt der folgende "
-"Ausdruck auf Blog-Seiten, die mit einem der beiden angegebenen Tags "
-"versehen sind:"
+"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern zur "
+"Gruppierung verwendet werden. Zum Beispiel passt der folgende Ausdruck auf "
+"Blog-Seiten, die mit einem der beiden angegebenen Tags versehen sind:"
 
 #. type: Plain text
 #, no-wrap
@@ -249,10 +170,110 @@ msgid ""
 "directory of the page containing the pagespec, you can use \"./\". For "
 "example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
 msgstr ""
-"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen "
-"der Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` "
-"wird weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum "
-"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du "
-"`./` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`."
-
-
+"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen der "
+"Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` wird "
+"weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum "
+"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du `./"
+"` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die "
+#~ "angegebene Seite (oder das angegebene Muster) enthalten"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag "
+#~ "versehen sind oder auf diesen verweisen (auch hier kann ein Muster "
+#~ "verwendet werden)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen "
+#~ "Seite verwiesen wird"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen "
+#~ "Monat erstellt wurden"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(year)`\" - der ein Jahr"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(page)`\" - passt nur auf Seiten, die nach der "
+#~ "angegebenen Seite angelegt wurden"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(page)`\" - passt nur auf Seiten, die vor der "
+#~ "angegebenen Seite angelegt wurden."
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene "
+#~ "Muster passt. Das Muster direkt anzugeben ist eine Abkürzung für diese "
+#~ "Funktion."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern "
+#~ "verwendete Seiten erfasst, auf die normale Muster nicht passen."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten auf "
+#~ "die angegebenen Muster passen."
+
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem "
+#~ "angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine "
+#~ "OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. "
+#~ "zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-"
+#~ "Administratoren gemacht wird."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse "
+#~ "aus gemacht wird."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch "
+#~ "das Muster angegebenen Seite gemacht wird"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.es.po b/po/underlays/basewiki/ikiwiki/pagespec.es.po
index 124e3333c..535bd0dba 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-23 21:00+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,9 +28,9 @@ msgid ""
 "a PageSpec. This is an expression that matches a set of pages."
 msgstr ""
 "Para seleccionar un conjunto de páginas, como páginas que están bloqueadas, "
-"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas para combinar "
-"en un blog, el wiki utiliza una PageSpec. Ésta consiste en una expresión que se "
-"corresponde con un conjunto de páginas."
+"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas "
+"para combinar en un blog, el wiki utiliza una PageSpec. Ésta consiste en una "
+"expresión que se corresponde con un conjunto de páginas."
 
 #. type: Plain text
 msgid ""
@@ -53,10 +54,11 @@ msgid ""
 "does not match the SandBox itself:"
 msgstr ""
 "A menudo querrá seleccionar cualquier página que tenga alguna particularidad "
-"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa cualquier "
-"parte del nombre de una página, y \"`?`\" cualquier letra del nombre de una página. "
-"Así, esto se corresponde con todas las páginas sobre música, y cualquier [[subpágina|SubPage]] "
-"de la [[zona de pruebas («SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:"
+"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa "
+"cualquier parte del nombre de una página, y \"`?`\" cualquier letra del "
+"nombre de una página. Así, esto se corresponde con todas las páginas sobre "
+"música, y cualquier [[subpágina|SubPage]] de la [[zona de pruebas "
+"(«SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:"
 
 #. type: Plain text
 #, no-wrap
@@ -68,9 +70,10 @@ msgid ""
 "You can also prefix an item with \"`!`\" to skip pages that match it. So to "
 "match all pages except for Discussion pages and the SandBox:"
 msgstr ""
-"También puede utilizar \"`!`\" delante de un elemento para que no se incluyan "
-"las páginas que se correspondan con ese elemento. Así, para seleccionar todas "
-"las páginas excepto las de Discusión y la Zona de pruebas («SandBox»):"
+"También puede utilizar \"`!`\" delante de un elemento para que no se "
+"incluyan las páginas que se correspondan con ese elemento. Así, para "
+"seleccionar todas las páginas excepto las de Discusión y la Zona de pruebas "
+"(«SandBox»):"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -84,121 +87,49 @@ msgstr ""
 "Se pueden añadir límites más elaborados para seleccionar páginas utilizando "
 "estas funciones:"
 
-#. type: Bullet: '* '
-msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(page)`\" - selecciona solamente páginas que enlazan a una determiada "
-"página (o patrón «glob»)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o enlazadas "
-"a la etiqueta dada (o etiquetas que se corresponden con un patrón «glob»)"
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una "
-"página determinada"
-
-#. type: Bullet: '* '
-msgid "\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el mes dado"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "\"`creation_day(mday)`\" - o en el día del mes"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "\"`creation_year(year)`\" - o en el año"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(page)`\" - selecciona solamente páginas creadas después de que la "
-"página dada fuera creada"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr ""
-"\"`created_before(page)`\" - selecciona solamente páginas creadas antes de que la "
-"página dada fuera creada"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden con el «glob» "
-"dado. Escribir simplemente el «glob» mismo es una abreviatura para esta función."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de uso "
-"interno, que los «globs» normalmente no seleccionan."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los metadatos "
-"dados, que se corresponden con el «glob» especificado."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"\"`user(username)`\" - comprueba si se está haciendo una modificación por un "
-"usuario con el nombre de usuario especificado. Si openid está habilitado, también "
-"se puede usar aquí un openid."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"\"`admin()`\" - comprueba si se está haciendo una modificación por uno de "
-"los administradores del wiki."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"\"`ip(address)`\" - comprueba si se está haciendo una modificación desde "
-"la dirección IP especificada."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo comentarios "
-"a una página que se corresponde con el «glob» especificado"
 
 #. type: Plain text
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
-"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la página "
-"sobre música y que fueron escritas en 2005:"
+"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la "
+"página sobre música y que fueron escritas en 2005:"
 
 #. type: Plain text
 #, no-wrap
@@ -213,12 +144,12 @@ msgid ""
 "to match one expression. Note that it doesn't make sense to say \"index and "
 "SandBox\", since no page can match both expressions."
 msgstr ""
-"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo son seleccionadas "
-"las páginas que se corresponden con cada una de las tres expresiones. Utilice \"and\" "
-"cuando quiera combinar una expresión como ésa; utilice \"or\" cuando sea suficiente que una "
-"página se corresponda con una de las expresiones. Fíjese en que no tiene sentido decir "
-"\"index and SandBox\", puesto que ninguna página puede corresponderse con ambas "
-"expresiones."
+"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo "
+"son seleccionadas las páginas que se corresponden con cada una de las tres "
+"expresiones. Utilice \"and\" cuando quiera combinar una expresión como ésa; "
+"utilice \"or\" cuando sea suficiente que una página se corresponda con una "
+"de las expresiones. Fíjese en que no tiene sentido decir \"index and SandBox"
+"\", puesto que ninguna página puede corresponderse con ambas expresiones."
 
 #. type: Plain text
 msgid ""
@@ -226,9 +157,9 @@ msgid ""
 "grouping. For example, to match pages in a blog that are tagged with either "
 "of two tags, use:"
 msgstr ""
-"También se pueden crear expresiones más complejas, utilizando paréntesis para "
-"agruparlas. Por ejemplo, para seleccionar páginas de un blog que están etiquetadas "
-"con alguna de dos etiquetas, utilice:"
+"También se pueden crear expresiones más complejas, utilizando paréntesis "
+"para agruparlas. Por ejemplo, para seleccionar páginas de un blog que están "
+"etiquetadas con alguna de dos etiquetas, utilice:"
 
 #. type: Plain text
 #, no-wrap
@@ -243,9 +174,116 @@ msgid ""
 "directory of the page containing the pagespec, you can use \"./\". For "
 "example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
 msgstr ""
-"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan según los "
-"nombre de archivo absolutos de las páginas del wiki, de tal modo que una «pagespec» "
-"\"foo\" utilizada en la página \"a/b\" no seleccionará una página llamada \"a/foo\" o \"a/b/foo\". "
-"Para seleccionar de manera relativa al directorio de la página que contiene la «pagespec», "
-"puede utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la página \"a/foo\"."
+"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan "
+"según los nombre de archivo absolutos de las páginas del wiki, de tal modo "
+"que una «pagespec» \"foo\" utilizada en la página \"a/b\" no seleccionará "
+"una página llamada \"a/foo\" o \"a/b/foo\". Para seleccionar de manera "
+"relativa al directorio de la página que contiene la «pagespec», puede "
+"utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la "
+"página \"a/foo\"."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "\"`link(page)`\" - selecciona solamente páginas que enlazan a una "
+#~ "determiada página (o patrón «glob»)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o "
+#~ "enlazadas a la etiqueta dada (o etiquetas que se corresponden con un "
+#~ "patrón «glob»)"
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una "
+#~ "página determinada"
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el "
+#~ "mes dado"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "\"`creation_day(mday)`\" - o en el día del mes"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "\"`creation_year(year)`\" - o en el año"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_after(page)`\" - selecciona solamente páginas creadas después "
+#~ "de que la página dada fuera creada"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "\"`created_before(page)`\" - selecciona solamente páginas creadas antes "
+#~ "de que la página dada fuera creada"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden "
+#~ "con el «glob» dado. Escribir simplemente el «glob» mismo es una "
+#~ "abreviatura para esta función."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de "
+#~ "uso interno, que los «globs» normalmente no seleccionan."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los "
+#~ "metadatos dados, que se corresponden con el «glob» especificado."
+
+#, fuzzy
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "\"`user(username)`\" - comprueba si se está haciendo una modificación por "
+#~ "un usuario con el nombre de usuario especificado. Si openid está "
+#~ "habilitado, también se puede usar aquí un openid."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "\"`admin()`\" - comprueba si se está haciendo una modificación por uno de "
+#~ "los administradores del wiki."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "\"`ip(address)`\" - comprueba si se está haciendo una modificación desde "
+#~ "la dirección IP especificada."
 
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo "
+#~ "comentarios a una página que se corresponde con el «glob» especificado"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index aeec3b95e..b95b818b1 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: 2009-09-02 17:42+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"PO-Revision-Date: 2010-07-16 10:47+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,14 @@ msgid ""
 "part of a page name, and \"`?`\" for any single letter of a page name. So "
 "this matches all pages about music, and any [[SubPage]]s of the SandBox, but "
 "does not match the SandBox itself:"
-msgstr "La plupart du temps, vous voulez trouver les pages qui contiennent une expression particulière dans leur nom. Cela s'obtient en utilisant un motif (« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle partie du nom de la page et le métacaractère « `?` » à n'importe quelle lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais pas à la *SandBox* elle-même :"
+msgstr ""
+"La plupart du temps, vous voulez trouver les pages qui contiennent une "
+"expression particulière dans leur nom. Cela s'obtient en utilisant un motif "
+"(« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle "
+"partie du nom de la page et le métacaractère « `?` » à n'importe quelle "
+"lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant "
+"de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais "
+"pas à la *SandBox* elle-même :"
 
 #. type: Plain text
 #, no-wrap
@@ -61,7 +69,10 @@ msgstr "\t*musique* or SandBox/*\n"
 msgid ""
 "You can also prefix an item with \"`!`\" to skip pages that match it. So to "
 "match all pages except for Discussion pages and the SandBox:"
-msgstr "Vous pouvez également préfixer un élément avec « `!` » pour ignorer les pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages Discussion et la page *SandBox* :"
+msgstr ""
+"Vous pouvez également préfixer un élément avec « `!` » pour ignorer les "
+"pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages "
+"Discussion et la page *SandBox* :"
 
 #. type: Bullet: '	* '
 msgid "and !SandBox and !*/Discussion"
@@ -75,107 +86,41 @@ msgstr ""
 "Des contraintes plus élaborées peuvent être ajoutées avec les fonctions "
 "suivantes :"
 
-#. type: Bullet: '* '
-msgid ""
-"\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou motif)"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-"« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont liées "
-"à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
-
-#. type: Bullet: '* '
-msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
-msgstr ""
-"« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
-"(lien) par la page donnée."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`creation_month(month)`\" - matches only pages created on the given month"
-msgstr "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
-
-#. type: Bullet: '* '
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
-
-#. type: Bullet: '* '
-msgid "\"`creation_year(year)`\" - or year"
-msgstr "« `creation_year(année)` » - ou année"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_after(page)`\" - matches only pages created after the given page "
-"was created"
-msgstr ""
-"« `created_after(page)` » - correspond aux pages créées après la page donnée"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`created_before(page)`\" - matches only pages created before the given "
-"page was created"
-msgstr "« `created_before(page) » - correspond aux pages créées avant la page donnée"
-
-#. type: Bullet: '* '
-msgid ""
-"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
-"N'écrire que le motif lui-même est un raccourci pour cette fonction."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux pages "
-"à usage interne que la fonction glob ne trouve pas en général."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
-"`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
-"correspondant au motif donné."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-"« `user(identifiant)` » - teste si une modification est faite par "
-"l'identifiant donné. Si openid est activé, on peut aussi l'utiliser."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-"« `admin()` » - teste si une modification par un administrateur est en cours."
-
-#. type: Bullet: '* '
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
-msgstr ""
-"« `ip(adresse)` » - teste si une modification par l'IP donnée est en cours."
-
-#. type: Bullet: '* '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"\"`postcomment(glob)`\" - matches only when comments are being posted to a "
-"page matching the specified glob"
+"* \"`glob(someglob)`\" - matches pages and other files that match the given glob.\n"
+"  Just writing the glob by itself is actually a shorthand for this function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag (or\n"
+"  tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given page\n"
+"  was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given page\n"
+"  was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+"  pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+"  \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+"  - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+"  user with the specified username. If openid is enabled, an openid can also\n"
+"  be put here. Glob patterns can be used in the username. For example, \n"
+"  to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+"  wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+"  specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+"  posted to a page matching the specified glob\n"
 msgstr ""
-"« `postcomment(motif) » - ne correspond que si des commentaires sont postés "
-"vers une page correspondant au motif donné."
 
 #. type: Plain text
 msgid ""
@@ -199,10 +144,11 @@ msgid ""
 "SandBox\", since no page can match both expressions."
 msgstr ""
 "Veuillez noter l'utilisation du « and » dans l'exemple ci-dessus. Seules les "
-"pages dont les trois conditions sont vraies seront trouvées. Utilisez « and » "
-"pour ce genre d'expression combinée. « or » est utilisé quand une seule des "
-"trois conditions est suffisante. Veuillez noter que « index and SandBox » n'a "
-"pas de sens puisqu'aucune page ne peut correspondre aux deux expressions."
+"pages dont les trois conditions sont vraies seront trouvées. Utilisez "
+"« and » pour ce genre d'expression combinée. « or » est utilisé quand une "
+"seule des trois conditions est suffisante. Veuillez noter que « index and "
+"SandBox » n'a pas de sens puisqu'aucune page ne peut correspondre aux deux "
+"expressions."
 
 #. type: Plain text
 msgid ""
@@ -229,8 +175,111 @@ msgid ""
 msgstr ""
 "Veuillez noter que le nom d'une page dans une spécification de page "
 "correspond au nom absolu du fichier dans le wiki. Ainsi une expression "
-"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée « a/"
-"foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
+"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée "
+"« a/foo » ni à une page « a/b/foo ». Pour une correspondance relative au "
 "répertoire de la page contenant la spécification, vous pouvez utiliser "
-"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page « a/"
-"foo »."
+"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page "
+"« a/foo »."
+
+#~ msgid ""
+#~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
+#~ msgstr ""
+#~ "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou "
+#~ "motif)"
+
+#~ msgid ""
+#~ "\"`tagged(tag)`\" - matches pages that are tagged or link to the given "
+#~ "tag (or tags matched by a glob)"
+#~ msgstr ""
+#~ "« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont "
+#~ "liées à l'étiquette donnée (ou des étiquettes correspondant à un motif)."
+
+#~ msgid "\"`backlink(page)`\" - matches only pages that a given page links to"
+#~ msgstr ""
+#~ "« `backlink(page)` » - correspond seulement aux pages qui sont pointées "
+#~ "(lien) par la page donnée."
+
+#~ msgid ""
+#~ "\"`creation_month(month)`\" - matches only pages created on the given "
+#~ "month"
+#~ msgstr ""
+#~ "« `creation_month(mois)` » - correspond aux pages créées durant ce mois"
+
+#~ msgid "\"`creation_day(mday)`\" - or day of the month"
+#~ msgstr "« `creation_day(jour)` » - ou au jour de ce mois"
+
+#~ msgid "\"`creation_year(year)`\" - or year"
+#~ msgstr "« `creation_year(année)` » - ou année"
+
+#~ msgid ""
+#~ "\"`created_after(page)`\" - matches only pages created after the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "« `created_after(page)` » - correspond aux pages créées après la page "
+#~ "donnée"
+
+#~ msgid ""
+#~ "\"`created_before(page)`\" - matches only pages created before the given "
+#~ "page was created"
+#~ msgstr ""
+#~ "« `created_before(page) » - correspond aux pages créées avant la page "
+#~ "donnée"
+
+#~ msgid ""
+#~ "\"`glob(someglob)`\" - matches pages that match the given glob. Just "
+#~ "writing the glob by itself is actually a shorthand for this function."
+#~ msgstr ""
+#~ "« `glob(motif)` » - correspond aux pages correspondantes au motif donné. "
+#~ "N'écrire que le motif lui-même est un raccourci pour cette fonction."
+
+#~ msgid ""
+#~ "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
+#~ "that globs do not usually match."
+#~ msgstr ""
+#~ "« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux "
+#~ "pages à usage interne que la fonction glob ne trouve pas en général."
+
+#~ msgid ""
+#~ "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
+#~ "(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
+#~ "metadata, matching the specified glob."
+#~ msgstr ""
+#~ "« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, "
+#~ "`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées "
+#~ "correspondant au motif donné."
+
+#~| msgid ""
+#~| "\"`user(username)`\" - tests whether a modification is being made by a "
+#~| "user with the specified username. If openid is enabled, an openid can "
+#~| "also be put here."
+#~ msgid ""
+#~ "\"`user(username)`\" - tests whether a modification is being made by a "
+#~ "user with the specified username. If openid is enabled, an openid can "
+#~ "also be put here. Glob patterns can be used in the username. For example, "
+#~ "to match all openid users, use `user(*://*)`"
+#~ msgstr ""
+#~ "« `user(identifiant)` » - teste si une modification est faite par "
+#~ "l'identifiant donné. Si openid est activé, on peut aussi l'utiliser. "
+#~ "L'identifiant peut contenir des expressions régulières. Par exemple, pour "
+#~ "obtenir tous les utilisateurs openid, utilisez l'expression `user(*://*)`."
+
+#~ msgid ""
+#~ "\"`admin()`\" - tests whether a modification is being made by one of the "
+#~ "wiki admins."
+#~ msgstr ""
+#~ "« `admin()` » - teste si une modification par un administrateur est en "
+#~ "cours."
+
+#~ msgid ""
+#~ "\"`ip(address)`\" - tests whether a modification is being made from the "
+#~ "specified IP address."
+#~ msgstr ""
+#~ "« `ip(adresse)` » - teste si une modification par l'IP donnée est en "
+#~ "cours."
+
+#~ msgid ""
+#~ "\"`postcomment(glob)`\" - matches only when comments are being posted to "
+#~ "a page matching the specified glob"
+#~ msgstr ""
+#~ "« `postcomment(motif) » - ne correspond que si des commentaires sont "
+#~ "postés vers une page correspondant au motif donné."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
index 2eb1493c8..3d12a009e 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 09:04+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,10 +41,16 @@ msgstr ""
 "`allowed_attachments` určovat, které typy příloh budou povoleny."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Například pokud byste chtěli omezit všechny soubory na 50 kilobajtů s "
 "výjimkou větčích mp3 souborů nahraných uživatelem joey do specifického "
@@ -51,8 +58,9 @@ msgstr ""
 "virů, mohli byste použít něco jako:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
index 6f3d28632..aa9e1434c 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,18 +47,25 @@ msgstr ""
 "`allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Som eksempel, for at begrænse vilkårlige filer til 50 kilobytes, men tillade "
 "større mp3-filer at blive lagt op af joey til en bestemt mappe, og checke "
 "alle vedhæftninger for vira, kunne noget i stil med dette bruges:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
index 1a20a5f0e..d0b2ba9cb 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:17+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -42,24 +43,27 @@ msgstr ""
 "`allowed_attachments` verändert."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
-"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, "
-"aber größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, "
-"und alle Anhänge nach Viren durchsucht werden, indem etwas wie "
-"das Folgende verwendet wird:"
+"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, aber "
+"größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, und "
+"alle Anhänge nach Viren durchsucht werden, indem etwas wie das Folgende "
+"verwendet wird:"
 
 #. type: Plain text
-#, no-wrap
-msgid ""
-"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
-msgstr ""
-"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
 msgid ""
@@ -72,12 +76,12 @@ msgstr ""
 #. type: Bullet: '* '
 msgid ""
 "\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
-"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", "
-"\"gb\" etc can be used to specify the units."
+"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb"
+"\" etc can be used to specify the units."
 msgstr ""
 "\"`maxsize(size)`\" - prüft ob der Anhang nicht größer ist als angegeben. "
-"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, "
-"`gb` und so weiter kann verwendet werden, um die Einheit anzugeben."
+"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, `gb` und "
+"so weiter kann verwendet werden, um die Einheit anzugeben."
 
 #. type: Bullet: '* '
 msgid ""
@@ -118,5 +122,3 @@ msgstr ""
 #. type: Bullet: '* '
 msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
 msgstr "\"`virusfree()`\" - prüft den Anhang mit einem Virenscanner."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
index 201d87937..a2cdfc8dd 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 13:21+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,24 +38,31 @@ msgid ""
 "attachments will be accepted, via the `allowed_attachments` configuration "
 "setting."
 msgstr ""
-"Si los archivos adjuntos están activados, el administrador del wiki puede controlar "
-"qué tipos de archivos adjuntos serán aceptados a través de la opción de configuración "
-"`allowed_attachments`."
+"Si los archivos adjuntos están activados, el administrador del wiki puede "
+"controlar qué tipos de archivos adjuntos serán aceptados a través de la "
+"opción de configuración `allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
-"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir que "
-"joey envíe archivos mp3 más grandes a un directorio específico, y comprobar "
-"todos los archivos adjuntos en busca de virus, se podría utilizar algo como lo "
-"siguiente:"
+"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir "
+"que joey envíe archivos mp3 más grandes a un directorio específico, y "
+"comprobar todos los archivos adjuntos en busca de virus, se podría utilizar "
+"algo como lo siguiente:"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
@@ -62,8 +70,8 @@ msgid ""
 "The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
 "additional tests:"
 msgstr ""
-"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
-"siguientes:"
+"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones "
+"adicionales siguientes:"
 
 #. type: Bullet: '* '
 msgid ""
@@ -72,8 +80,8 @@ msgid ""
 "\" etc can be used to specify the units."
 msgstr ""
 "\"`maxsize(tamaño)`\" - comprueba que el archivo adjunto no sea más grande "
-"que el tamaño especificado. De manera predeterminada el tamaño se expresa "
-"en bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las "
+"que el tamaño especificado. De manera predeterminada el tamaño se expresa en "
+"bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las "
 "unidades."
 
 #. type: Bullet: '* '
@@ -81,8 +89,8 @@ msgid ""
 "\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
 "specified size."
 msgstr ""
-"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño que "
-"el tamaño especificado."
+"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño "
+"que el tamaño especificado."
 
 #. type: Bullet: '* '
 msgid ""
@@ -90,9 +98,9 @@ msgid ""
 "a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
 "enabled page format)."
 msgstr ""
-"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki como una "
-"página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de cualquier otro "
-"formato de página activado)."
+"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki "
+"como una página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de "
+"cualquier otro formato de página activado)."
 
 #. type: Plain text
 #, no-wrap
@@ -110,10 +118,10 @@ msgid ""
 "\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
 "include a glob in the type, for example `mimetype(image/*)`."
 msgstr ""
-"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede incluir "
-"un «glob» en el tipo, por ejemplo `mimetype(image/*)`."
+"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede "
+"incluir un «glob» en el tipo, por ejemplo `mimetype(image/*)`."
 
 #. type: Bullet: '* '
 msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
-msgstr "\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus."
-
+msgstr ""
+"\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
index 10f942033..9985f9ce5 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 14:46+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -40,10 +41,16 @@ msgstr ""
 "`allowed_attachments`."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
+#| "mp3 files to be uploaded by joey into a specific directory, and check all "
+#| "attachments for viruses, something like this could be used:"
 msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for viruses, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
 msgstr ""
 "Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre "
 "que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire "
@@ -51,8 +58,9 @@ msgstr ""
 "peut utiliser quelque chose comme ça :"
 
 #. type: Plain text
-#, no-wrap
-msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+#, fuzzy, no-wrap
+#| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
index 6e09fa4e6..2cf84cf45 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 09:20+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,6 +52,14 @@ msgstr ""
 "„`currentlang()`“ - testuje, zda je stránka napsána ve stejném jazyce jako "
 "aktuální stránka."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -59,3 +68,8 @@ msgstr ""
 "O každé stránce, která nepoužívá „po“ překlad, se předpokládá, že je napsaná "
 "v jazyce zadaném proměnnou `po_master_language` v konfiguračním souboru "
 "ikiwiki."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.da.po b/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
index b719d25fe..9861d3c64 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 11:33+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-20 11:41+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,6 +57,14 @@ msgstr ""
 "\"`currentlang()`\" - tester hvorvidt en side er skrevet i samme sprog som "
 "den nuværende side."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -63,3 +72,8 @@ msgid ""
 msgstr ""
 "Bemærk at enhver ikke-po side antages at være skrevet i "
 "`po_master_language`, som angivet i `ikiwiki.setup`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
index 785b16ffa..266e30875 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:55+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,15 +27,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular "
-"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests "
-"that can be used to improve user navigation in a multi-lingual wiki:"
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
+"PageSpec]] syntax is expanded with the following additional tests that can "
+"be used to improve user navigation in a multi-lingual wiki:"
 msgstr ""
 "Wenn die [[!iki plugins/po desc=po]]-Erweiterung aktiviert ist, ist die "
-"reguläre "
-"[[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests erweitert, "
-"die zur Verbesserung der Benutzernavigation in mehrsprachigen Wikis "
-"verwendet werden kann:"
+"reguläre [[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests "
+"erweitert, die zur Verbesserung der Benutzernavigation in mehrsprachigen "
+"Wikis verwendet werden kann:"
 
 #. type: Bullet: '* '
 msgid ""
@@ -42,8 +42,8 @@ msgid ""
 "as a ISO639-1 (two-letter) language code."
 msgstr ""
 "\"`lang(LL)`\" - prüft ob eine Seite in der angegebenen Sprache geschrieben "
-"ist. "
-"Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 angegeben."
+"ist. Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 "
+"angegeben."
 
 #. type: Bullet: '* '
 msgid ""
@@ -51,20 +51,25 @@ msgid ""
 "as the current page."
 msgstr ""
 "\"`currentlang()`\" - prüft, ob eine Seite in der gleichen Sprache "
-"geschrieben ist wie "
-"die aktuelle Seite."
+"geschrieben ist wie die aktuelle Seite."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
 
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
 "`po_master_language`, as specified in `ikiwiki.setup`."
 msgstr ""
-"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language` "
-" angenommen wird, wie in `ikiwiki.setup` angegeben."
+"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language`  "
+"angenommen wird, wie in `ikiwiki.setup` angegeben."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
index 3a9d8d4a1..e44033056 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 13:48+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,33 +33,45 @@ msgid ""
 "PageSpec]] syntax is expanded with the following additional tests that can "
 "be used to improve user navigation in a multi-lingual wiki:"
 msgstr ""
-"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la sintaxis "
-"normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales "
-"siguientes, que se pueden utilizar  para mejorar la navegación del usuario en "
-"un wiki multilingüe:"
+"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la "
+"sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones "
+"adicionales siguientes, que se pueden utilizar  para mejorar la navegación "
+"del usuario en un wiki multilingüe:"
 
 #. type: Bullet: '* '
 msgid ""
 "\"`lang(LL)`\" - tests whether a page is written in the language specified "
 "as a ISO639-1 (two-letter) language code."
 msgstr ""
-"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma especificado según "
-"el código ISO639-1 (dos letras)."
+"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma "
+"especificado según el código ISO639-1 (dos letras)."
 
 #. type: Bullet: '* '
 msgid ""
 "\"`currentlang()`\" - tests whether a page is written in the same language "
 "as the current page."
 msgstr ""
-"\"`currentlang()`\" - comprueba si una página está escrita en el mismo idioma "
-"que la página actual."
+"\"`currentlang()`\" - comprueba si una página está escrita en el mismo "
+"idioma que la página actual."
+
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
 
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
 "`po_master_language`, as specified in `ikiwiki.setup`."
 msgstr ""
-"Tenga en cuenta que se considera que cualquier página que no "
-"sea de tipo «po» está escrita en `po_master_language`, según "
-"se especifica en `ikiwiki.setup`."
+"Tenga en cuenta que se considera que cualquier página que no sea de tipo "
+"«po» está escrita en `po_master_language`, según se especifica en `ikiwiki."
+"setup`."
 
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
index a771f6ef7..760e3cf24 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-30 09:37+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -29,7 +30,11 @@ msgid ""
 "If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/"
 "PageSpec]] syntax is expanded with the following additional tests that can "
 "be used to improve user navigation in a multi-lingual wiki:"
-msgstr "Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de [[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants qui peuvent améliorer la navigation d'un utilisateur de wiki plurilinguistique :"
+msgstr ""
+"Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de "
+"[[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants "
+"qui peuvent améliorer la navigation d'un utilisateur de wiki "
+"plurilinguistique :"
 
 #. type: Bullet: '* '
 msgid ""
@@ -47,6 +52,14 @@ msgstr ""
 "`currentlang()` - teste si une page est écrite dans la langue de la page "
 "donnée."
 
+#. type: Bullet: '* '
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec. A minimum target translation percentage can "
+"optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
+"matches only pages less than 50% translated."
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "Note that every non-po page is considered to be written in "
@@ -55,3 +68,8 @@ msgstr ""
 "Notez que chaque page qui n'est pas de type po est considérée comme une page "
 "écrite selon le `po_master_language`, tel que spécifié dans le fichier de "
 "configuration `ikiwiki.setup`."
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/subpage.cs.po b/po/underlays/basewiki/ikiwiki/subpage.cs.po
index 8a69549f9..2df8ad5a1 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.cs.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-26 17:01+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,10 +34,16 @@ msgstr ""
 "stránek."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Pro přidání [[podstránky|SubPage]] jednoduše vytvořte podadresář a umístěte "
diff --git a/po/underlays/basewiki/ikiwiki/subpage.da.po b/po/underlays/basewiki/ikiwiki/subpage.da.po
index 09343501b..0b264895a 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.da.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,10 +39,16 @@ msgstr ""
 "sider."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "En [[UnderSide|SubPage]] oprettes ved blot at oprette undermappen og tilføje "
diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po
index 184144ca0..68fb4e08f 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.de.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:19+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,9 +24,9 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "ikiwiki supports placing pages in a directory hierarchy. For example, this "
-"page, [[SubPage]] has some related pages placed under it, like "
-"[[SubPage/LinkingRules]]. This is a useful way to add some order to your "
-"wiki rather than just having a great big directory full of pages."
+"page, [[SubPage]] has some related pages placed under it, like [[SubPage/"
+"LinkingRules]]. This is a useful way to add some order to your wiki rather "
+"than just having a great big directory full of pages."
 msgstr ""
 "In ikiwiki werden Seiten in einem Verzeichnisbaum angeordnet. Zum Beispiel "
 "gibt es unterhalb dieser Seite, [[SubPage]], einige verwandte Seiten, etwa "
@@ -34,10 +35,16 @@ msgstr ""
 "haben."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Um eine Unterseite hinzuzufügen, legt man einfach ein Unterverzeichnis an "
@@ -50,5 +57,3 @@ msgstr ""
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
 msgstr ""
 "Wie Links auf Unterseiten gesetzt werden, wird in [[LinkingRules]] erklärt."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/subpage.es.po b/po/underlays/basewiki/ikiwiki/subpage.es.po
index 0b0c8453e..054a311e9 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.es.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.es.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-03 18:21+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,25 +28,32 @@ msgid ""
 "LinkingRules]]. This is a useful way to add some order to your wiki rather "
 "than just having a great big directory full of pages."
 msgstr ""
-"ikiwiki permite colocar páginas en una jerarquía de directorios. Por ejemplo, bajo "
-"esta página, [[SubPage]] («subpágina»), hay algunas páginas relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de poner un poco de orden "
-"en el wiki, en lugar de tener simplemente un gran directorio lleno de páginas."
+"ikiwiki permite colocar páginas en una jerarquía de directorios. Por "
+"ejemplo, bajo esta página, [[SubPage]] («subpágina»), hay algunas páginas "
+"relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de "
+"poner un poco de orden en el wiki, en lugar de tener simplemente un gran "
+"directorio lleno de páginas."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
-"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas en "
-"él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y hay además "
-"un directorio «SubPage», que contiene «SubPage/LinkingRules.mdwn». Las subpáginas "
-"pueden anidarse tanto como desee."
+"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas "
+"en él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y "
+"hay además un directorio «SubPage», que contiene «SubPage/LinkingRules."
+"mdwn». Las subpáginas pueden anidarse tanto como desee."
 
 #. type: Plain text
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
 msgstr ""
-"La creación de un enlace a y desde una subpágina se explica en [[LinkingRules]] "
-"(Reglas para la creación de enlaces)."
-
+"La creación de un enlace a y desde una subpágina se explica en "
+"[[LinkingRules]] (Reglas para la creación de enlaces)."
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index cf0e56cd9..61264b406 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-25 10:31+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -32,10 +33,16 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "To add a SubPage, just make a subdirectory and put pages in it. For "
+#| "example, this page is SubPage.mdwn in this wiki's source, and there is "
+#| "also a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. "
+#| "Subpages can be nested as deeply as you'd like."
 msgid ""
 "To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
 "nested as deeply as you'd like."
 msgstr ""
 "Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.cs.po b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
index 1ca35af2f..27515a519 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.cs.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-27 08:23+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,14 +50,6 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Také pokud soubor odkazovaný pomocí wiki odkazu vypadá jako obrázek, bude "
-"zobrazen přímo ve stránce."
-
-#. type: Plain text
-msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
@@ -83,24 +76,40 @@ msgid ""
 msgstr ""
 "Pro odkaz na kotvu uvnitř stránky použijte něco jako `\\[[WikiLink#kotva]]`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Direktivy a wiki odkazy"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Také pokud soubor odkazovaný pomocí wiki odkazu vypadá jako obrázek, bude "
+"zobrazen přímo ve stránce."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki používá pro [[direktivy|directive]] dva zápisy. Starší zápis používá "
-"pro rozlišení mezi direktivami a wiki odkazy mezery. To znamená, že ve wiki "
-"odkazech pak nemůžete použít mezery a musíte je nahradit podtržítky. Novější "
-"zápis, který se povoluje v konfiguračním souboru volbou `prefix_directives` "
-"vyžaduje, aby direktivy začínaly vykřičníkem a tím pádem nevylučuje odkazy s "
-"mezerami. Budoucí verze ikiwiki budou mít tuto volbu implicitně zapnutou."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Direktivy a wiki odkazy"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki používá pro [[direktivy|directive]] dva zápisy. Starší zápis "
+#~ "používá pro rozlišení mezi direktivami a wiki odkazy mezery. To znamená, "
+#~ "že ve wiki odkazech pak nemůžete použít mezery a musíte je nahradit "
+#~ "podtržítky. Novější zápis, který se povoluje v konfiguračním souboru "
+#~ "volbou `prefix_directives` vyžaduje, aby direktivy začínaly vykřičníkem a "
+#~ "tím pádem nevylučuje odkazy s mezerami. Budoucí verze ikiwiki budou mít "
+#~ "tuto volbu implicitně zapnutou."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.da.po b/po/underlays/basewiki/ikiwiki/wikilink.da.po
index 8c565844f..90fe53088 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.da.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,14 +53,6 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil "
-"det blive vist indlejret i siden."
-
-#. type: Plain text
-msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
@@ -86,25 +79,41 @@ msgstr ""
 "For at henvise til et anker inde på en side, kan du bruge noget i stil med `"
 "\\[[WikiLink#foo]]` ."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Direktiver og wikilinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil "
+"det blive vist indlejret i siden."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
-"brugte mellemrum til at skelne mellem direktiver og wikilinks; det medfører, "
-"at når den syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må "
-"erstatte mellemrum med understregning. Den nyere syntaks, aktiveret med "
-"valget `prefix_directives` i en ikiwiki-opsætningsfil, sætter `!` foran "
-"direktiver, og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige "
-"versioner af ikiwiki vil aktivere dette valg som standard."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Direktiver og wikilinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
+#~ "brugte mellemrum til at skelne mellem direktiver og wikilinks; det "
+#~ "medfører, at når den syntaks anvendes kan du ikke bruge mellemrum i "
+#~ "WikiLinks, og må erstatte mellemrum med understregning. Den nyere "
+#~ "syntaks, aktiveret med valget `prefix_directives` i en ikiwiki-"
+#~ "opsætningsfil, sætter `!` foran direktiver, og forhindrer derfor ikke "
+#~ "henvisninger med mellemrum. Fremtidige versioner af ikiwiki vil aktivere "
+#~ "dette valg som standard."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po
index ccdd20303..ac6c02e36 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.de.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po
@@ -4,10 +4,11 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 13:41+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,18 +26,17 @@ msgid ""
 "For example `\\[[WikiLink]]`."
 msgstr ""
 "WikiLinks ermöglichen es, auf einfache Weise Links zwischen Seiten im Wiki "
-"zu setzen. "
-"Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der Zielseite in "
-"doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`."
+"zu setzen. Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der "
+"Zielseite in doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "If you ever need to write something like `\\[[WikiLink]]` without creating a "
 "wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
 msgstr ""
-"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, "
-"ohne einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in "
-"`\\\\[[WikiLink]]`."
+"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, ohne "
+"einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in `\\"
+"\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
@@ -48,21 +48,13 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses "
-"innerhalb der Seite angezeigt."
-
-#. type: Plain text
-msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
 msgstr ""
-"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, "
-"man braucht sich also keine Gedanken über identische Schreibweise zu machen "
-"und kann zum Beispiel das erste Wort eines Satzes groß schreiben."
+"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, man "
+"braucht sich also keine Gedanken über identische Schreibweise zu machen und "
+"kann zum Beispiel das erste Wort eines Satzes groß schreiben."
 
 #. type: Plain text
 msgid ""
@@ -71,41 +63,53 @@ msgid ""
 "SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
 msgstr ""
 "Es ist auch möglich einen WikiLink zu schreiben, der etwas anderes als den "
-"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist "
-"`\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint "
-"als [[foo_bar|SandBox]]."
+"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist `"
+"\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint als "
+"[[foo_bar|SandBox]]."
 
 #. type: Plain text
 msgid ""
-"To link to an anchor inside a page, you can use something like "
-"`\\[[WikiLink#foo]]` ."
+"To link to an anchor inside a page, you can use something like `"
+"\\[[WikiLink#foo]]` ."
 msgstr ""
-"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie "
-"`\\[[WikiLink#foo]]` verwenden."
+"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie `"
+"\\[[WikiLink#foo]]` verwenden."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Anweisungen und WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses "
+"innerhalb der Seite angezeigt."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die ältere "
-"Syntax verwendete Leerzeichen, um zwischen Anweisungen und WikiLinks "
-"zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser Syntax "
-"keine Leerzeichen in WikiLinks verwendet werden können und durch "
-"Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch "
-"die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt "
-"Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. "
-"Zukünftige Versionen von ikiwiki werden diese Option standardmäßig "
-"aktivieren."
 
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Anweisungen und WikiLinks"
 
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die "
+#~ "ältere Syntax verwendete Leerzeichen, um zwischen Anweisungen und "
+#~ "WikiLinks zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser "
+#~ "Syntax keine Leerzeichen in WikiLinks verwendet werden können und durch "
+#~ "Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch "
+#~ "die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt "
+#~ "Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. Zukünftige "
+#~ "Versionen von ikiwiki werden diese Option standardmäßig aktivieren."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.es.po b/po/underlays/basewiki/ikiwiki/wikilink.es.po
index 252bc9984..2f547892a 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.es.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wikilink\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-12-06 17:57+0100\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: none\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,33 +27,26 @@ msgid ""
 "[[WikiLink]], just put the name of the page to link to in double brackets.  "
 "For example `\\[[WikiLink]]`."
 msgstr ""
-"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para crear un "
-"[[WikiLink]], ponga simplemente el nombre de la página a enlazar entre corchetes "
-"dobles. Por ejemplo, `\\[[WikiLink]]`."
+"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para "
+"crear un [[WikiLink]], ponga simplemente el nombre de la página a enlazar "
+"entre corchetes dobles. Por ejemplo, `\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "If you ever need to write something like `\\[[WikiLink]]` without creating a "
 "wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
 msgstr ""
-"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, simplemente añada "
-"`\\` como prefijo, de la siguiente manera: `\\\\[[WikiLink]]`."
+"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, "
+"simplemente añada `\\` como prefijo, de la siguiente manera: `\\"
+"\\[[WikiLink]]`."
 
 #. type: Plain text
 msgid ""
 "There are some special [[SubPage/LinkingRules]] that come into play when "
 "linking between [[SubPages|SubPage]]."
 msgstr ""
-"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] especiales "
-"que entran en juego al enlazar [[Subpáginas|SubPage]]."
-
-#. type: Plain text
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Además, si el archivo enlazado por un WikiLink parece una imagen, se mostrará "
-"como parte de la página."
+"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] "
+"especiales que entran en juego al enlazar [[Subpáginas|SubPage]]."
 
 #. type: Plain text
 msgid ""
@@ -60,9 +54,10 @@ msgid ""
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
 msgstr ""
-"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si se "
-"usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por esto, y "
-"puede por ejemplo utilizar mayúsculas en un enlace si se encuentra al principio de una frase."
+"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si "
+"se usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por "
+"esto, y puede por ejemplo utilizar mayúsculas en un enlace si se encuentra "
+"al principio de una frase."
 
 #. type: Plain text
 msgid ""
@@ -70,9 +65,10 @@ msgid ""
 "page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
 "SandBox page, but the link will appear like this: [[foo_bar|SandBox]]."
 msgstr ""
-"También es posible escribir un WikiLink que use otra cosa en lugar del nombre de la "
-"página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]` enlaza a la página "
-"de la zona de pruebas («SandBox»), pero el enlace aparece así: [[foo_bar|SandBox]]."
+"También es posible escribir un WikiLink que use otra cosa en lugar del "
+"nombre de la página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]"
+"` enlaza a la página de la zona de pruebas («SandBox»), pero el enlace "
+"aparece así: [[foo_bar|SandBox]]."
 
 #. type: Plain text
 msgid ""
@@ -82,26 +78,41 @@ msgstr ""
 "Para enlazar a un punto («anchor») dentro de una página, puede utilizar algo "
 "como `\\[[WikiLink#foo]]` ."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Directivas y WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"Además, si el archivo enlazado por un WikiLink parece una imagen, se "
+"mostrará como parte de la página."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis antigua "
-"utilizaba espacios para distinguir entre directivas y wikilinks; como resultado, "
-"al utilizar esa sintaxis, no podía utilizar espacios en los WikiLinks, y debía reemplazar "
-"los espacios con guiones bajos. La nueva sintaxis, activada con la opción `prefix_directives` "
-"en un archivo de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así no "
-"impide enlaces con espacios. Futuras versiones de ikiwiki activarán esta opción de "
-"manera predeterminada."
 
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Directivas y WikiLinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis "
+#~ "antigua utilizaba espacios para distinguir entre directivas y wikilinks; "
+#~ "como resultado, al utilizar esa sintaxis, no podía utilizar espacios en "
+#~ "los WikiLinks, y debía reemplazar los espacios con guiones bajos. La "
+#~ "nueva sintaxis, activada con la opción `prefix_directives` en un archivo "
+#~ "de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así "
+#~ "no impide enlaces con espacios. Futuras versiones de ikiwiki activarán "
+#~ "esta opción de manera predeterminada."
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index ac464fb18..f527ef364 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-28 16:05+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -47,14 +48,6 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
-"est affiché au fil du texte sur la page."
-
-#. type: Plain text
-msgid ""
 "WikiLinks are matched with page names in a case-insensitive manner, so you "
 "don't need to worry about getting the case the same, and can capitalise "
 "links at the start of a sentence, and so on."
@@ -82,26 +75,41 @@ msgstr ""
 "Pour pointer vers une ancre à l'intérieur d'une page, vous pouvez utiliser "
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Directives and WikiLinks"
-msgstr "Directives et WikiLinks"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Also, if the file linked to by a WikiLink looks like an image, it will be "
+#| "displayed inline on the page."
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
+msgstr ""
+"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
+"est affiché au fil du texte sur la page."
 
 #. type: Plain text
 msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores.  The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces.  Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page.  Email "
+"addresses can also be used to generate a mailto link."
 msgstr ""
-"Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
-"syntaxe se sert d'espaces pour différencier les directives et les Wikilinks. "
-"Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser d'espaces dans les "
-"WikiLinks et vous devez les remplacer par des tirets bas `_`. La nouvelle "
-"syntaxe, activée par l'option `prefix_directives` dans le fichier de "
-"configuration d'ikiwiki, préfixe les directives par un `!`, ce qui permet "
-"l'utilisation d'espaces dans les liens. Dans les futures versions d'ikiwiki, "
-"cette option sera activée par défaut."
+
+#~ msgid "Directives and WikiLinks"
+#~ msgstr "Directives et WikiLinks"
+
+#~ msgid ""
+#~ "ikiwiki has two syntaxes for [[directives|directive]].  The older syntax "
+#~ "used spaces to distinguish between directives and wikilinks; as a result, "
+#~ "with that syntax in use, you cannot use spaces in WikiLinks, and must "
+#~ "replace spaces with underscores.  The newer syntax, enabled with the "
+#~ "`prefix_directives` option in an ikiwiki setup file, prefixes directives "
+#~ "with `!`, and thus does not prevent links with spaces.  Future versions "
+#~ "of ikiwiki will turn this option on by default."
+#~ msgstr ""
+#~ "Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne "
+#~ "syntaxe se sert d'espaces pour différencier les directives et les "
+#~ "Wikilinks. Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser "
+#~ "d'espaces dans les WikiLinks et vous devez les remplacer par des tirets "
+#~ "bas `_`. La nouvelle syntaxe, activée par l'option `prefix_directives` "
+#~ "dans le fichier de configuration d'ikiwiki, préfixe les directives par un "
+#~ "`!`, ce qui permet l'utilisation d'espaces dans les liens. Dans les "
+#~ "futures versions d'ikiwiki, cette option sera activée par défaut."
diff --git a/po/underlays/basewiki/shortcuts.cs.po b/po/underlays/basewiki/shortcuts.cs.po
index 7ae43e31a..15d523011 100644
--- a/po/underlays/basewiki/shortcuts.cs.po
+++ b/po/underlays/basewiki/shortcuts.cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-08-28 11:20+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -76,8 +76,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
 msgstr ""
 "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"chyba č. %s"
 "\"]]"
@@ -117,7 +122,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -153,6 +193,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Použití: `\\[[!debss balík]]`, `\\[[!debss balík#verze]]` nebo `\\[[!debss balík/verze]]`. Podrobnosti na http://snapshot.debian.net.\n"
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index c342d12e1..b9498d997 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -80,8 +80,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
 msgstr ""
 "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
@@ -120,7 +125,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -156,6 +196,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Brug: `\\[[!debss package]]`, `\\[[!debss package#version]]`, eller `\\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.\n"
diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po
index 8ac3759f5..10c26023f 100644
--- a/po/underlays/basewiki/shortcuts.es.po
+++ b/po/underlays/basewiki/shortcuts.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
 "PO-Revision-Date: 2009-08-17 01:02+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
@@ -61,7 +61,8 @@ msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr ""
+"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
@@ -76,8 +77,15 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
+msgstr ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -100,8 +108,10 @@ msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgid ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr ""
+"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -112,7 +122,42 @@ msgstr ""
 "\"]]"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -148,6 +193,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Uso: `\\[[!debss package]]`, `\\[[!debss package#version]]`, o `\\[[!debss package/version]]`. Para más detalles, vea http://snapshot.debian.net .\n"
@@ -185,11 +232,6 @@ msgstr ""
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 
 #. type: Plain text
-#| msgid ""
-#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the "
-#| "url, \"%s\" is replaced with the text passed to the named shortcut, after "
-#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-#| "optional `desc` parameter controls the description of the link."
 msgid ""
 "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
 "\"%s\" is replaced with the text passed to the named shortcut, after [[!"
@@ -198,9 +240,9 @@ msgid ""
 msgstr ""
 "Para añadir un nuevo atajo, utilice la [[directiva|ikiwiki/directive]] "
 "`shortcut`. En el url, «%s» se reemplaza con el texto que se pasa al atajo "
-"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%S» se "
-"reemplaza con el texto en bruto, no codificado. El parámetro opcional `desc` "
-"controla la descripción del enlace."
+"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%"
+"S» se reemplaza con el texto en bruto, no codificado. El parámetro opcional "
+"`desc` controla la descripción del enlace."
 
 #. type: Plain text
 msgid ""
@@ -215,11 +257,6 @@ msgstr ""
 "un parámetro `desc` que anulará la que se proporcione en la definición."
 
 #. type: Plain text
-#| msgid ""
-#| "If you come up with a shortcut that you think others might find useful, "
-#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]"
-#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will "
-#| "include your shortcut in the standard underlay."
 msgid ""
 "If you come up with a shortcut that you think others might find useful, "
 "consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
@@ -230,4 +267,3 @@ msgstr ""
 "aportarlo a la [página de atajos en el wiki ikiwiki](http://ikiwiki.info/"
 "shortcuts/), de tal modo que futuras versiones de ikiwiki puedan incluir su "
 "atajo en la base estándar."
-
diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po
index 3849918e4..b4755d4d7 100644
--- a/po/underlays/basewiki/shortcuts.fr.po
+++ b/po/underlays/basewiki/shortcuts.fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
-"PO-Revision-Date: 2009-08-26 21:17+0200\n"
+"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"PO-Revision-Date: 2010-07-16 10:39+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,10 +75,13 @@ msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
+#| msgid ""
+#| "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s"
+#| "\"]]"
 msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
+msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"bug #%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -116,6 +119,41 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
+#| msgid ""
+#| "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
+#| "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+#| "* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+#| "* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+#| "* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+#| "* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+#| "* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+#| "* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+#| "* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+#| "* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+#| "* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+#| "* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+#| "* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+#| "* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+#| "* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+#| "* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+#| "* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+#| "* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+#| "* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+#| "* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+#| "* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+#| "* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+#| "* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+#| "* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+#| "* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+#| "* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+#| "* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+#| "* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+#| "* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+#| "* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+#| "* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+#| "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+#| "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+#| "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
@@ -151,6 +189,8 @@ msgid ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 " * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n"
@@ -186,6 +226,8 @@ msgstr ""
 "* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
 "* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
 "* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]\n"
+"* [[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/templates.cs.po b/po/underlays/basewiki/templates.cs.po
index c30f067aa..5ac5cdb89 100644
--- a/po/underlays/basewiki/templates.cs.po
+++ b/po/underlays/basewiki/templates.cs.po
@@ -6,233 +6,334 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 09:38+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Tato wiki má šablony **povolené**.\"\n"
-"else=\"Tato wiki má šablony **vypnuté**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Chcete-li vložit hodnotu proměnné bez dalších úprav (bez převodu na html), "
+"použijte `<TMPL_VAR raw_proměnná>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
-msgstr "V této wiki jsou k dispozici následující šablony:"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+"Chcete-li blok textu zobrazit pouze pokud je nastavena příslušná proměnná, "
+"použijte `<TMPL_IF NAME=\"proměnná\">text</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Používání šablon"
+"Chcete-li použít jeden blok textu v případě, že je proměnná nastavená, a "
+"jiný blok textu pokud nastavená není, použijte `<TMPL_IF NAME=\"proměnná"
+"\">text<TMPL_ELSE>jiný text</TMPL_IF>`."
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Použití šablony vypadá následovně:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Text pro vložení do poznámky.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Tímto se v šabloně [[note]] vyplní pole `text` zadanou hodnotou a výsledek "
-"se vloží do stránky."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Hodnota může obsahovat libovolné značky, které jsou povoleny v běžné wiki "
-"stránce. Trojité uvozovky dokonce umožňují používat uvnitř hodnoty i běžné "
-"anglické uvozovky. V kombinaci s viceřádkovými hodnotami lze do šablony "
-"vložit poměrně velké kusy označkovaného textu:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"zelená\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Charlieho|Charley]] sestra."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Až vyrostu, chci být kosmonautem.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Opravdu, 8 a půl."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Vytvoření šablony"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Pro vytvoření šablony jednoduše přidejte do stránky direktivu template a "
-"stránka poskytne odkaz, který se dá použít pro vytvoření šablony. Šablona je "
-"běžná wiki stránka umístěná ve zdrojovém adresáři wiki v podadresáři "
-"`templates/`."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Šablona používá stejnou syntaxi jako perlový modul [[!cpan HTML::Template]], "
-"což umožňuje provádět poměrně komplexní věci. Úplný popis syntaxe naleznete "
-"v dokumentaci modulu, ale ve skutečnosti stačí znát jen pár věcí:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Každý parametr, který předáte direktivě template, vygeneruje proměnnou "
-"šablony. Existuje několik předdefinovaných proměnných jako PAGE a BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Pro vložení hodnoty proměnné použijte `<TMPL_VAR proměnná>`. Wiki značky v "
-"hodnotě budou nejprve převedeny na html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Chcete-li vložit hodnotu proměnné bez dalších úprav (bez převodu na html), "
-"použijte `<TMPL_VAR raw_proměnná>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Používání šablon"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Chcete-li blok textu zobrazit pouze pokud je nastavena příslušná proměnná, "
-"použijte `<TMPL_IF NAME=\"proměnná\">text</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Chcete-li použít jeden blok textu v případě, že je proměnná nastavená, a "
-"jiný blok textu pokud nastavená není, použijte `<TMPL_IF NAME=\"proměnná"
-"\">text<TMPL_ELSE>jiný text</TMPL_IF>`."
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Ukázková šablona:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Jméno: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Věk: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Oblíbená barva: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Žádná oblíbená barva.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Vyplněná šablona bude formátována stejně jako zbytek stránky, do které je "
-"vložena, tudíž můžete v šabloně používat wiki linky a všechny obvyklé "
-"formátovací značky. Změnou je, že se wiki linky neobjeví jako zpětné odkazy "
-"na stránku, která šablonu použila."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Všimněte si použití „raw_name“ uvnitř generátoru [[wiki odkazu|ikiwiki/"
-"WikiLink]]. Tímto se zajistí, že pokud by jméno obsahovalo něco, co by mohlo "
-"být považováno za formátovací wiki značku, nebude to převedeno na html před "
-"vytvořením [[wiki odkazu|ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Tato wiki má šablony **povolené**.\"\n"
+#~ "else=\"Tato wiki má šablony **vypnuté**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr "V této wiki jsou k dispozici následující šablony:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Použití šablony vypadá následovně:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Text pro vložení do poznámky.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Tímto se v šabloně [[note]] vyplní pole `text` zadanou hodnotou a "
+#~ "výsledek se vloží do stránky."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Hodnota může obsahovat libovolné značky, které jsou povoleny v běžné wiki "
+#~ "stránce. Trojité uvozovky dokonce umožňují používat uvnitř hodnoty i "
+#~ "běžné anglické uvozovky. V kombinaci s viceřádkovými hodnotami lze do "
+#~ "šablony vložit poměrně velké kusy označkovaného textu:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"zelená\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Charlieho|Charley]] sestra."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Až vyrostu, chci být kosmonautem.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Opravdu, 8 a půl."
+
+#~ msgid "Creating a template"
+#~ msgstr "Vytvoření šablony"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Pro vytvoření šablony jednoduše přidejte do stránky direktivu template a "
+#~ "stránka poskytne odkaz, který se dá použít pro vytvoření šablony. Šablona "
+#~ "je běžná wiki stránka umístěná ve zdrojovém adresáři wiki v podadresáři "
+#~ "`templates/`."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Šablona používá stejnou syntaxi jako perlový modul [[!cpan HTML::"
+#~ "Template]], což umožňuje provádět poměrně komplexní věci. Úplný popis "
+#~ "syntaxe naleznete v dokumentaci modulu, ale ve skutečnosti stačí znát jen "
+#~ "pár věcí:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Každý parametr, který předáte direktivě template, vygeneruje proměnnou "
+#~ "šablony. Existuje několik předdefinovaných proměnných jako PAGE a "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Pro vložení hodnoty proměnné použijte `<TMPL_VAR proměnná>`. Wiki značky "
+#~ "v hodnotě budou nejprve převedeny na html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Ukázková šablona:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Jméno: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Věk: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Oblíbená barva: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Žádná oblíbená barva.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Vyplněná šablona bude formátována stejně jako zbytek stránky, do které je "
+#~ "vložena, tudíž můžete v šabloně používat wiki linky a všechny obvyklé "
+#~ "formátovací značky. Změnou je, že se wiki linky neobjeví jako zpětné "
+#~ "odkazy na stránku, která šablonu použila."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Všimněte si použití „raw_name“ uvnitř generátoru [[wiki odkazu|ikiwiki/"
+#~ "WikiLink]]. Tímto se zajistí, že pokud by jméno obsahovalo něco, co by "
+#~ "mohlo být považováno za formátovací wiki značku, nebude to převedeno na "
+#~ "html před vytvořením [[wiki odkazu|ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.da.po b/po/underlays/basewiki/templates.da.po
index 22f9500e8..533c582cc 100644
--- a/po/underlays/basewiki/templates.da.po
+++ b/po/underlays/basewiki/templates.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-22 11:17+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,225 +21,327 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Denne wiki har skabeloner **aktiveret**.\"\n"
-"else=\"Denne wiki har skabeloner **deaktiveret**.\" ]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
-msgstr "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
+msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, "
+"med wiki-opmærkning endnu ikke konverteret til html."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"Disse skabeloner er tilgængelige til indsættelse på andre sider i denne wiki:"
+"Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME="
+"\"variabel\">tekst</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Brug af skabelon"
+"Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med "
+"`<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "En skabelon bruges som her:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Her er teksten til at sætte ind i min note.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den "
-"angivne værdi og indsætte resultatet på siden."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt på "
-"wikisiden udenfor skabelonen. Trippel-citering af værdien tillader endda at "
-"bruge citering som del af værdien. Kombineret med flerlinje-citerede værdier "
-"tillader dette indlejring af store klumper af opmærket tekst i skabelonen:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Charley]]'s søster."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Jeg vil være en astronaut når jeg bliver stor.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Egentligt 8 og et halvt."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Oprettelse af skabelon"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en side, "
-"så vil siden vise en henvisning som kan bruges til at oprette skabelonen. "
-"Skabelonen er en normal wikiside, placeret i `templates/` undermappen indeni "
-"wikiens kildemappe."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] som "
-"giver mulighed for at lave ret komplekse ting. Læs dokumentationen for den "
-"fulde syntaks, men alt hvad du reelt behøver at vide er nogle få ting:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Ethvert parameter du angiver til skabelondirektivet vil danne en "
-"skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og "
-"BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-"
-"opmærkning i værdien bliver først konverteret til html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, "
-"med wiki-opmærkning endnu ikke konverteret til html."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Brug af skabelon"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME="
-"\"variabel\">tekst</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
-"Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med "
-"`<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Her er et eksempel på en skabelon (det anbefales at bruge engelske "
-"variabelnavne for at undgå problemer med æøå og andre specialtegn):"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Navn: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Alder: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favoritfarve: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Ingen favoritfarve.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Den udfyldte skabelon vil blive formateret som resten af siden den er "
-"inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- "
-"opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke op "
-"som krydshenvisninger (backlinks) til den side som anvender skabelonen."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Bemærk brugen af \"raw_name\" indeni [[ikiwiki/WikiLink]]-generatoren. Dette "
-"sikrer at hvor navnet indeholder noget som måske kan fejltolkes som wiki-"
-"opmærkning, bliver det ikke konverteret til html før det er blevet behandlet "
-"som en [[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Denne wiki har skabeloner **aktiveret**.\"\n"
+#~ "else=\"Denne wiki har skabeloner **deaktiveret**.\" ]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Disse skabeloner er tilgængelige til indsættelse på andre sider i denne "
+#~ "wiki:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "En skabelon bruges som her:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Her er teksten til at sætte ind i min note.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den "
+#~ "angivne værdi og indsætte resultatet på siden."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt "
+#~ "på wikisiden udenfor skabelonen. Trippel-citering af værdien tillader "
+#~ "endda at bruge citering som del af værdien. Kombineret med flerlinje-"
+#~ "citerede værdier tillader dette indlejring af store klumper af opmærket "
+#~ "tekst i skabelonen:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Charley]]'s søster."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Jeg vil være en astronaut når jeg bliver stor.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Egentligt 8 og et halvt."
+
+#~ msgid "Creating a template"
+#~ msgstr "Oprettelse af skabelon"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en "
+#~ "side, så vil siden vise en henvisning som kan bruges til at oprette "
+#~ "skabelonen. Skabelonen er en normal wikiside, placeret i `templates/` "
+#~ "undermappen indeni wikiens kildemappe."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] "
+#~ "som giver mulighed for at lave ret komplekse ting. Læs dokumentationen "
+#~ "for den fulde syntaks, men alt hvad du reelt behøver at vide er nogle få "
+#~ "ting:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Ethvert parameter du angiver til skabelondirektivet vil danne en "
+#~ "skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-"
+#~ "opmærkning i værdien bliver først konverteret til html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr ""
+#~ "Her er et eksempel på en skabelon (det anbefales at bruge engelske "
+#~ "variabelnavne for at undgå problemer med æøå og andre specialtegn):"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Navn: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Alder: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favoritfarve: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Ingen favoritfarve.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Den udfyldte skabelon vil blive formateret som resten af siden den er "
+#~ "inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- "
+#~ "opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke "
+#~ "op som krydshenvisninger (backlinks) til den side som anvender skabelonen."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Bemærk brugen af \"raw_name\" indeni [[ikiwiki/WikiLink]]-generatoren. "
+#~ "Dette sikrer at hvor navnet indeholder noget som måske kan fejltolkes som "
+#~ "wiki-opmærkning, bliver det ikke konverteret til html før det er blevet "
+#~ "behandlet som en [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
index beb92b49f..c31957002 100644
--- a/po/underlays/basewiki/templates.de.po
+++ b/po/underlays/basewiki/templates.de.po
@@ -4,253 +4,343 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:15+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
 msgstr ""
-"[[!meta title=\"Vorlagen\"]]\n"
-"[[!if test=\"enabled(template)\"\n"
-"then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n"
-"else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
-msgstr ""
-"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
-"können."
-
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-
-#. type: Plain text
-msgid "These templates are available for inclusion onto other pages in this wiki:"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"Diese Vorlagen sind verfügbar und können in andere Seiten dieses "
-"Wikis eingebettet werden:"
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Verwenden einer Vorlage"
-
-#. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten "
+"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine "
-"Notiz eingefügt werden soll.\"\"\"]]\n"
+"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable "
+"gesetzt ist, verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem "
-"angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen "
+"anderen, wenn sie es nicht ist, verwende `<TMPL_IF NAME=\"Variable"
+"\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`."
 
 #. type: Plain text
-msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+
+#. type: Title ##
+#, no-wrap
+msgid "template pages"
 msgstr ""
-"Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen enthalten, "
-"die im Wiki außerhalb der Vorlage zulässig sind. Durch die Verwendung dreier "
-"Anführungszeichen können sogar Anführungszeichen enthalten sein. In Kombination "
-"mit mehrzeiligen Werten in Anführungszeichen können so große Mengen an "
-"zu formatierendem Text in die Vorlage eingefügt werden:"
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
-"notes=\"\"\"\n"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 "
-"notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "\\[[Thomas]] Schwester."
 
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Wirklich achteinhalb."
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Erstellen einer Vorlage"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Um eine Vorlage zu erstellen, füge einfach die Anweisung  `template` zu "
-"einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der "
-"Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im Unterverzeichnis "
-"`templates/` des Wiki-Quellverzeichnisses liegt."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::Template]], "
-"das die Umsetzung auch komplexer Vorhaben ermöglicht. In seiner Dokumentation "
-"ist die vollständige Syntax beschrieben, zur Verwendung muss man aber nur "
-"das Folgende wirklich wissen:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine "
-"Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige "
-"vordefinierte Variablen wie PAGE und BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. "
-"Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten "
-"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Verwenden einer Vorlage"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable gesetzt "
-"ist, "
-"verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen "
-"anderen, wenn sie es nicht ist, verwende `<TMPL_IF "
-"NAME=\"Variable\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`."
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Hier ist eine Beispiel-Vorlage:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"   <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Alter: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Lieblingsfarbe: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Keine Lieblingsfarbe.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, die "
-"sie enthält, man kann also WikiLinks und alle anderen Arten von "
-"Wiki-Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass "
-"solche WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die "
-"die Vorlage verwendet."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a "
-"[[ikiwiki/WikiLink]]."
-msgstr ""
-"Beachte auch die Verwendung von `raw_name` innerhalb des Generators für "
-"den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach HTML "
-"konvertiert wird, selbst wenn er etwas enthält, was für eine "
-"Wiki-Formatierungsanweisung gehalten werden könnte, bevor er als "
-"[[ikiwiki/WikiLink]] verarbeitet wird."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!meta title=\"Vorlagen\"]]\n"
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n"
+#~ "else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
+#~ "können."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Diese Vorlagen sind verfügbar und können in andere Seiten dieses Wikis "
+#~ "eingebettet werden:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz eingefügt werden soll.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem "
+#~ "angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen "
+#~ "enthalten, die im Wiki außerhalb der Vorlage zulässig sind. Durch die "
+#~ "Verwendung dreier Anführungszeichen können sogar Anführungszeichen "
+#~ "enthalten sein. In Kombination mit mehrzeiligen Werten in "
+#~ "Anführungszeichen können so große Mengen an zu formatierendem Text in die "
+#~ "Vorlage eingefügt werden:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "\\[[Thomas]] Schwester."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Wirklich achteinhalb."
+
+#~ msgid "Creating a template"
+#~ msgstr "Erstellen einer Vorlage"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Um eine Vorlage zu erstellen, füge einfach die Anweisung  `template` zu "
+#~ "einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der "
+#~ "Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im "
+#~ "Unterverzeichnis `templates/` des Wiki-Quellverzeichnisses liegt."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::"
+#~ "Template]], das die Umsetzung auch komplexer Vorhaben ermöglicht. In "
+#~ "seiner Dokumentation ist die vollständige Syntax beschrieben, zur "
+#~ "Verwendung muss man aber nur das Folgende wirklich wissen:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine "
+#~ "Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige "
+#~ "vordefinierte Variablen wie PAGE und BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. "
+#~ "Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Hier ist eine Beispiel-Vorlage:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "   <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Alter: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Lieblingsfarbe: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Keine Lieblingsfarbe.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
 
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, "
+#~ "die sie enthält, man kann also WikiLinks und alle anderen Arten von Wiki-"
+#~ "Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass solche "
+#~ "WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die die "
+#~ "Vorlage verwendet."
 
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Beachte auch die Verwendung von `raw_name` innerhalb des Generators für "
+#~ "den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach "
+#~ "HTML konvertiert wird, selbst wenn er etwas enthält, was für eine Wiki-"
+#~ "Formatierungsanweisung gehalten werden könnte, bevor er als [[ikiwiki/"
+#~ "WikiLink]] verarbeitet wird."
diff --git a/po/underlays/basewiki/templates.es.po b/po/underlays/basewiki/templates.es.po
index 21173d528..22042e318 100644
--- a/po/underlays/basewiki/templates.es.po
+++ b/po/underlays/basewiki/templates.es.po
@@ -6,237 +6,340 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 13:22+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
-
-#. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Este wiki tiene las plantillas **activadas**.\"\n"
-"else=\"Este wiki tiene las plantillas **desactivadas**.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"Las plantillas son archivos que se pueden completar e insertar en páginas "
-"del wiki."
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid ""
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
+msgstr ""
 
-#. type: Plain text
-msgid "These templates are available for inclusion onto other pages in this wiki:"
-msgstr "Estas plantillas están disponibles en este wiki para ser incluidas en otras páginas:"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Para insertar el valor sin procesar de una variable, con el marcado wiki no "
+"convertido todavía a html, utilice `<TMPL_VAR raw_variable>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"Para que un bloque de texto dependa de que una variable haya sido "
+"establecida, utilice `<TMPL_IF NAME=\"variable\">texto</TMPL_IF>`."
 
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Uso de una plantilla"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+msgid ""
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr ""
+"Para utilizar un bloque de texto si se ha establecido una variable, y otro "
+"texto si no se ha establecido, utilice `<TMPL_IF NAME=\"variable"
+"\">texto<TMPL_ELSE>otro texto</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "El uso de una plantilla es así:"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+msgid "template pages"
 msgstr ""
-"Esto rellena la plantilla [[note]] («nota»), completando el campo `text` "
-"(«texto») con el valor especificado, e inserta el resultado en la página."
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Por lo general, un valor puede incluir cualquier marcado («markup») permitido "
-"en la página wiki fuera de la plantilla. La utilización de comillas triples permite "
-"incluso que se incluyan comillas. En combinación con valores entrecomillados "
-"en múltiples líneas, esto permite que se incluyan grandes fragmentos de texto "
-"marcado en una plantilla:"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "Hermana de \\[[Charley]]."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Quiero ser astronauta cuando crezca.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "8 y medio en realidad."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Creación de una plantilla"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Para crear una plantilla, simplemente añada una directiva de plantilla a una "
-"página, y ésta proporcionará un enlace que puede utilizarse para crear la "
-"plantilla. La plantilla es una página wiki normal, situada en el subdirectorio "
-"`templates/` dentro del directorio fuente del wiki."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::Template]], "
-"que permite hacer algunas cosas bastante complejas. Consulte su documentación "
-"para ver la sintaxis completa, pero todo lo que realmente necesita saber son unas "
-"pocas cosas:"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Cada parámetro que pase a la directiva de plantilla generará una variable de "
-"plantilla. También existen algunas variables predefinidas como PAGE y BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Para introducir el valor de una variable, utilice `<TMPL_VAR variable>`. El marcado "
-"(«markup») wiki en el valor será convertido primero a html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Para insertar el valor sin procesar de una variable, con el marcado wiki no "
-"convertido todavía a html, utilice `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Uso de una plantilla"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Para que un bloque de texto dependa de que una variable haya sido establecida, "
-"utilice `<TMPL_IF NAME=\"variable\">texto</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Para utilizar un bloque de texto si se ha establecido una variable, y otro texto "
-"si no se ha establecido, utilice "
-"`<TMPL_IF NAME=\"variable\">texto<TMPL_ELSE>otro texto</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Esto es una plantilla de ejemplo:"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Nombre: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Edad: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Color favorito: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Ningún color favorito.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"La plantilla rellenada se formateará de la misma manera que el resto de la página "
-"que la contiene, así que puede incluir WikiLinks («enlaces wiki») y todas las otras "
-"formas de marcado wiki en la plantilla. Sin embargo, tenga en cuenta que estos "
-"WikiLinks no aparecerán como «backlinks» a la página que usa la plantilla."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/WikiLink]]. "
-"Esto asegura que si el nombre contiene algo que pueda ser tomado equivocadamente "
-"como marcado wiki, no sea convertido a html antes de ser procesado como un "
-"[[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Este wiki tiene las plantillas **activadas**.\"\n"
+#~ "else=\"Este wiki tiene las plantillas **desactivadas**.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Las plantillas son archivos que se pueden completar e insertar en páginas "
+#~ "del wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr ""
+#~ "Estas plantillas están disponibles en este wiki para ser incluidas en "
+#~ "otras páginas:"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "El uso de una plantilla es así:"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Esto rellena la plantilla [[note]] («nota»), completando el campo `text` "
+#~ "(«texto») con el valor especificado, e inserta el resultado en la página."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Por lo general, un valor puede incluir cualquier marcado («markup») "
+#~ "permitido en la página wiki fuera de la plantilla. La utilización de "
+#~ "comillas triples permite incluso que se incluyan comillas. En combinación "
+#~ "con valores entrecomillados en múltiples líneas, esto permite que se "
+#~ "incluyan grandes fragmentos de texto marcado en una plantilla:"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "Hermana de \\[[Charley]]."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Quiero ser astronauta cuando crezca.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "8 y medio en realidad."
+
+#~ msgid "Creating a template"
+#~ msgstr "Creación de una plantilla"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Para crear una plantilla, simplemente añada una directiva de plantilla a "
+#~ "una página, y ésta proporcionará un enlace que puede utilizarse para "
+#~ "crear la plantilla. La plantilla es una página wiki normal, situada en el "
+#~ "subdirectorio `templates/` dentro del directorio fuente del wiki."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::"
+#~ "Template]], que permite hacer algunas cosas bastante complejas. Consulte "
+#~ "su documentación para ver la sintaxis completa, pero todo lo que "
+#~ "realmente necesita saber son unas pocas cosas:"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Cada parámetro que pase a la directiva de plantilla generará una variable "
+#~ "de plantilla. También existen algunas variables predefinidas como PAGE y "
+#~ "BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Para introducir el valor de una variable, utilice `<TMPL_VAR variable>`. "
+#~ "El marcado («markup») wiki en el valor será convertido primero a html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Esto es una plantilla de ejemplo:"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Nombre: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Edad: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Color favorito: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Ningún color favorito.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "La plantilla rellenada se formateará de la misma manera que el resto de "
+#~ "la página que la contiene, así que puede incluir WikiLinks («enlaces "
+#~ "wiki») y todas las otras formas de marcado wiki en la plantilla. Sin "
+#~ "embargo, tenga en cuenta que estos WikiLinks no aparecerán como "
+#~ "«backlinks» a la página que usa la plantilla."
 
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/"
+#~ "WikiLink]]. Esto asegura que si el nombre contiene algo que pueda ser "
+#~ "tomado equivocadamente como marcado wiki, no sea convertido a html antes "
+#~ "de ser procesado como un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 37d578ec8..f7faadb15 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -5,235 +5,337 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-09-12 08:40+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
 
 #. type: Plain text
-#, no-wrap
-msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr "[[!meta robots=\"noindex, follow\"]]\n"
+msgid ""
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
+msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"Les modèles sont **activés** dans ce wiki.\"\n"
-"else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
-"]]\n"
 
 #. type: Plain text
 msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to learn. "
+"All you really need to know to modify templates is this:"
 msgstr ""
-"Les modèles sont des fichiers pouvant être remplis et insérés dans les pages "
-"du wiki."
 
-#. type: Plain text
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To insert the raw value of a variable, with wiki markup not yet converted "
+#| "to html, use `<TMPL_VAR raw_variable>`."
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
+msgstr ""
+"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
+"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
 
-#. type: Plain text
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
+#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
-msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
+"NAME=\"variable\">texte</TMPL_IF>`."
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "To use one block of text if a variable is set and a second if it's not, "
+#| "use `<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
 msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
 msgstr ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
-
-#. type: Title ##
-#, no-wrap
-msgid "Using a template"
-msgstr "Utiliser un modèle"
+"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
+"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
+"texte</TMPL_IF>`"
 
 #. type: Plain text
-msgid "Using a template works like this:"
-msgstr "Voici comment fonctionne un modèle :"
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Plain text
+#. type: Title ##
 #, no-wrap
-msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
-msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
-
-#. type: Plain text
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
-msgstr "Cette expression remplit le modèle [[note]], remplaçant le champ `text` par la valeur spécifiée, et insérant le résultat dans la page."
+msgid "template pages"
+msgstr ""
 
 #. type: Plain text
 msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Généralement, une valeur peut inclure n'importe quelle balise qui serait "
-"autorisée dans les pages du wiki. Tripler les guillemets autour de la valeur "
-"permet même d'y inclure des guillemets. Ainsi, avec des valeurs sur "
-"plusieurs lignes, de larges morceaux de texte mis en forme peuvent être "
-"intégrés dans un modèle :"
 
 #. type: Plain text
-#, no-wrap
-msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-
-#. type: Bullet: '        * '
-msgid "\\[[Charley]]'s sister."
-msgstr "soeur de \\[[Charley]]."
-
-#. type: Bullet: '        * '
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
-
-#. type: Bullet: '        * '
-msgid "Really 8 and a half."
-msgstr "Réellement 8 ans et demi."
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
-msgid "Creating a template"
-msgstr "Créer un modèle"
-
-#. type: Plain text
-msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+msgid "default content for new pages"
 msgstr ""
-"Pour créer un modèle, ajoutez simplement une directive `template` à une "
-"page. La page fournira alors un lien qui peut être utilisé pour créer le "
-"modèle. Le modèle est une page de wiki régulière, enregistrée dans le sous-"
-"répertoire `templates/` du répertoire source du wiki."
 
 #. type: Plain text
 msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
+"The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
+"can be used to make new pages default to containing text from a template "
+"page, which can be filled out as the page is edited."
 msgstr ""
-"Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
-"Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
-"documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
-"réellement besoin que de quelques informations :"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Chaque paramètre que vous donnez à la directive `template` générera une "
-"variable dans le modèle. Il y a en plus quelques variables prédéfinies comme "
-"PAGE et BASENAME."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Bullet: '* '
+#. type: Plain text
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+#| "sort=title template=titlepage]]\n"
 msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
-"Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
-"syntaxe wiki dans la valeur sera d'abord transformée en html."
+"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
+"sort=title template=titlepage]]\n"
 
-#. type: Bullet: '* '
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
-"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#, fuzzy, no-wrap
+#| msgid "Using a template"
+msgid "wiki templates"
+msgstr "Utiliser un modèle"
 
-#. type: Bullet: '* '
+#. type: Plain text
 msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
-"Pour écrire un bloc de texte si une variable est définie, utilisez `<TMPL_IF "
-"NAME=\"variable\">texte</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
-"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
-"le cas contraire, utilisez `<TMPL_IF NAME=\"variable\">texte<TMPL_ELSE>autre "
-"texte</TMPL_IF>`"
-
-#. type: Plain text
-msgid "Here's a sample template:"
-msgstr "Voici un exemple de modèle :"
 
 #. type: Plain text
 #, no-wrap
 msgid ""
-"        <span class=\"infobox\">\n"
-"        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age: <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Favorite color: <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        No favorite color.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
+"  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
+"  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and rss/atom links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+"  a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+"  and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+"  search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+"  make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+"  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+"  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+"  interface; do not normally need to be customised.\n"
 msgstr ""
-"        <span class=\"infobox\">\n"
-"        Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
-"        Age : <TMPL_VAR age><br />\n"
-"        <TMPL_IF NAME=\"color\">\n"
-"        Couleur favorite : <TMPL_VAR color><br />\n"
-"        <TMPL_ELSE>\n"
-"        Pas de couleur favorite.<br />\n"
-"        </TMPL_IF>\n"
-"        <TMPL_IF NAME=\"notes\">\n"
-"        <hr />\n"
-"        <TMPL_VAR notes>\n"
-"        </TMPL_IF>\n"
-"        </span>\n"
 
 #. type: Plain text
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-"Le modèle rempli sera mis en forme comme le reste de la page qui le "
-"contient. Vous pouvez donc inclure des WikiLinks et toutes les autres formes "
-"de balises wiki dans les modèles. Notez cependant que de tels WikiLinks "
-"n'apparaîtront pas dans les BackLinks de la page qui utilise le modèle."
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
-#. type: Plain text
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a [[ikiwiki/"
-"WikiLink]]."
-msgstr ""
-"Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de [[ikiwiki/"
-"WikiLink]]. Cela assure que si le nom contient quelque chose pouvant être "
-"confondu avec une balise wiki, alors il n'est pas converti en html avant "
-"d'être traité comme un [[ikiwiki/WikiLink]]."
+#~ msgid ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"This wiki has templates **enabled**.\"\n"
+#~ "else=\"This wiki has templates **disabled**.\"\n"
+#~ "]]\n"
+#~ msgstr ""
+#~ "[[!if test=\"enabled(template)\"\n"
+#~ "then=\"Les modèles sont **activés** dans ce wiki.\"\n"
+#~ "else=\"Les modèles sont **désactivés** dans ce wiki.\"\n"
+#~ "]]\n"
+
+#~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Les modèles sont des fichiers pouvant être remplis et insérés dans les "
+#~ "pages du wiki."
+
+#~ msgid ""
+#~ "These templates are available for inclusion onto other pages in this wiki:"
+#~ msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :"
+
+#~ msgid "Using a template works like this:"
+#~ msgstr "Voici comment fonctionne un modèle :"
+
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n"
+
+#~ msgid ""
+#~ "This fills out the [[note]] template, filling in the `text` field with "
+#~ "the specified value, and inserts the result into the page."
+#~ msgstr ""
+#~ "Cette expression remplit le modèle [[note]], remplaçant le champ `text` "
+#~ "par la valeur spécifiée, et insérant le résultat dans la page."
+
+#~ msgid ""
+#~ "Generally, a value can include any markup that would be allowed in the "
+#~ "wiki page outside the template. Triple-quoting the value even allows "
+#~ "quotes to be included in it. Combined with multi-line quoted values, this "
+#~ "allows for large chunks of marked up text to be embedded into a template:"
+#~ msgstr ""
+#~ "Généralement, une valeur peut inclure n'importe quelle balise qui serait "
+#~ "autorisée dans les pages du wiki. Tripler les guillemets autour de la "
+#~ "valeur permet même d'y inclure des guillemets. Ainsi, avec des valeurs "
+#~ "sur plusieurs lignes, de larges morceaux de texte mis en forme peuvent "
+#~ "être intégrés dans un modèle :"
+
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+
+#~ msgid "\\[[Charley]]'s sister."
+#~ msgstr "soeur de \\[[Charley]]."
+
+#~ msgid "\"I want to be an astronaut when I grow up.\""
+#~ msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\""
+
+#~ msgid "Really 8 and a half."
+#~ msgstr "Réellement 8 ans et demi."
+
+#~ msgid "Creating a template"
+#~ msgstr "Créer un modèle"
+
+#~ msgid ""
+#~ "To create a template, simply add a template directive to a page, and the "
+#~ "page will provide a link that can be used to create the template. The "
+#~ "template is a regular wiki page, located in the `templates/` subdirectory "
+#~ "inside the source directory of the wiki."
+#~ msgstr ""
+#~ "Pour créer un modèle, ajoutez simplement une directive `template` à une "
+#~ "page. La page fournira alors un lien qui peut être utilisé pour créer le "
+#~ "modèle. Le modèle est une page de wiki régulière, enregistrée dans le "
+#~ "sous-répertoire `templates/` du répertoire source du wiki."
+
+#~ msgid ""
+#~ "The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+#~ "module, which allows for some fairly complex things to be done. Consult "
+#~ "its documentation for the full syntax, but all you really need to know "
+#~ "are a few things:"
+#~ msgstr ""
+#~ "Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::"
+#~ "Template]], qui permet de faire des choses plutôt complexes. Consultez sa "
+#~ "documentation pour obtenir la syntaxe complète. Cependant, vous n'avez "
+#~ "réellement besoin que de quelques informations :"
+
+#~ msgid ""
+#~ "Each parameter you pass to the template directive will generate a "
+#~ "template variable. There are also some pre-defined variables like PAGE "
+#~ "and BASENAME."
+#~ msgstr ""
+#~ "Chaque paramètre que vous donnez à la directive `template` générera une "
+#~ "variable dans le modèle. Il y a en plus quelques variables prédéfinies "
+#~ "comme PAGE et BASENAME."
+
+#~ msgid ""
+#~ "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup "
+#~ "in the value will first be converted to html."
+#~ msgstr ""
+#~ "Pour insérer la valeur d'une variable, utilisez `<TMPL_VAR variable>`. La "
+#~ "syntaxe wiki dans la valeur sera d'abord transformée en html."
+
+#~ msgid "Here's a sample template:"
+#~ msgstr "Voici un exemple de modèle :"
+
+#~ msgid ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age: <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Favorite color: <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        No favorite color.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+#~ msgstr ""
+#~ "        <span class=\"infobox\">\n"
+#~ "        Nom : \\[[<TMPL_VAR raw_name>]]<br />\n"
+#~ "        Age : <TMPL_VAR age><br />\n"
+#~ "        <TMPL_IF NAME=\"color\">\n"
+#~ "        Couleur favorite : <TMPL_VAR color><br />\n"
+#~ "        <TMPL_ELSE>\n"
+#~ "        Pas de couleur favorite.<br />\n"
+#~ "        </TMPL_IF>\n"
+#~ "        <TMPL_IF NAME=\"notes\">\n"
+#~ "        <hr />\n"
+#~ "        <TMPL_VAR notes>\n"
+#~ "        </TMPL_IF>\n"
+#~ "        </span>\n"
+
+#~ msgid ""
+#~ "The filled out template will be formatted the same as the rest of the "
+#~ "page that contains it, so you can include WikiLinks and all other forms "
+#~ "of wiki markup in the template. Note though that such WikiLinks will not "
+#~ "show up as backlinks to the page that uses the template."
+#~ msgstr ""
+#~ "Le modèle rempli sera mis en forme comme le reste de la page qui le "
+#~ "contient. Vous pouvez donc inclure des WikiLinks et toutes les autres "
+#~ "formes de balises wiki dans les modèles. Notez cependant que de tels "
+#~ "WikiLinks n'apparaîtront pas dans les BackLinks de la page qui utilise le "
+#~ "modèle."
+
+#~ msgid ""
+#~ "Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. "
+#~ "This ensures that if the name contains something that might be mistaken "
+#~ "for wiki markup, it's not converted to html before being processed as a "
+#~ "[[ikiwiki/WikiLink]]."
+#~ msgstr ""
+#~ "Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de "
+#~ "[[ikiwiki/WikiLink]]. Cela assure que si le nom contient quelque chose "
+#~ "pouvant être confondu avec une balise wiki, alors il n'est pas converti "
+#~ "en html avant d'être traité comme un [[ikiwiki/WikiLink]]."
diff --git a/po/underlays/basewiki/templates/note.cs.po b/po/underlays/basewiki/templates/note.cs.po
index 74f66e9a0..3cf27acc5 100644
--- a/po/underlays/basewiki/templates/note.cs.po
+++ b/po/underlays/basewiki/templates/note.cs.po
@@ -6,21 +6,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 10:11+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/note.da.po b/po/underlays/basewiki/templates/note.da.po
index f748dbe4d..1e9cef84d 100644
--- a/po/underlays/basewiki/templates/note.da.po
+++ b/po/underlays/basewiki/templates/note.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,12 +21,24 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po
index c408d11a0..41e9909b0 100644
--- a/po/underlays/basewiki/templates/note.de.po
+++ b/po/underlays/basewiki/templates/note.de.po
@@ -4,22 +4,35 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 20:04+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
@@ -34,9 +47,7 @@ msgstr ""
 "<TMPL_UNLESS NAME=\"text\">\n"
 "Verwende diese Vorlage, um eine Notiz in eine Seite einzufügen. Die Notiz\n"
 "wird rechts vom restlichen Text der Seite schwebend angezeigt werden.\n"
-"Diese Vorlage hat einen Parameter:"
-"<ul>\n"
+"Diese Vorlage hat einen Parameter:<ul>\n"
 "<li>`text` - der Text, der in der Notiz angezeigt werden soll.\n"
 "</ul>\n"
 "</TMPL_UNLESS>\n"
-
diff --git a/po/underlays/basewiki/templates/note.es.po b/po/underlays/basewiki/templates/note.es.po
index de2c53f5f..186ae48dd 100644
--- a/po/underlays/basewiki/templates/note.es.po
+++ b/po/underlays/basewiki/templates/note.es.po
@@ -6,22 +6,35 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 13:48+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
@@ -41,4 +54,3 @@ msgstr ""
 "<li>`text` - el texto que aparecerá en la nota\n"
 "</ul>\n"
 "</TMPL_UNLESS>\n"
-
diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po
index b02e62e3b..c9bfaa2ca 100644
--- a/po/underlays/basewiki/templates/note.fr.po
+++ b/po/underlays/basewiki/templates/note.fr.po
@@ -6,21 +6,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-24 00:18+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<div class=\"notebox\">\n"
+#| "<TMPL_VAR text>\n"
+#| "</div>\n"
+#| "<TMPL_UNLESS NAME=\"text\">\n"
+#| "Use this template to insert a note into a page. The note will be styled to\n"
+#| "float to the right of other text on the page. This template has one\n"
+#| "parameter:\n"
+#| "<ul>\n"
+#| "<li>`text` - the text to display in the note\n"
+#| "</ul>\n"
+#| "</TMPL_UNLESS>\n"
 msgid ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Use this template to insert a note into a page. The note will be styled to\n"
 "float to the right of other text on the page. This template has one\n"
 "parameter:\n"
diff --git a/po/underlays/basewiki/templates/popup.cs.po b/po/underlays/basewiki/templates/popup.cs.po
index 5951b0145..17d7342bf 100644
--- a/po/underlays/basewiki/templates/popup.cs.po
+++ b/po/underlays/basewiki/templates/popup.cs.po
@@ -6,18 +6,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2009-08-28 02:49-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-20 10:28+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
diff --git a/po/underlays/basewiki/templates/popup.da.po b/po/underlays/basewiki/templates/popup.da.po
index f7660152f..c4bd3badc 100644
--- a/po/underlays/basewiki/templates/popup.da.po
+++ b/po/underlays/basewiki/templates/popup.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 23:45+0200\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,9 +21,26 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po
index c75b79d94..a17b9c611 100644
--- a/po/underlays/basewiki/templates/popup.de.po
+++ b/po/underlays/basewiki/templates/popup.de.po
@@ -4,21 +4,38 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-03-12 09:29+0530\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-12 20:08+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
-"Use this template to create a popup window that is displayed when the "
-"mouse\n"
+"<TMPL_UNLESS mouseover>\n"
+"Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
 "<li>`mouseover` - This is the text or other content that triggers the\n"
@@ -31,29 +48,21 @@ msgid ""
 "inline in the page, inside square brackets.\n"
 "</TMPL_UNLESS>\n"
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
-"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
-"popup></span><span class=\"paren\">]</span>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
 msgstr ""
 "<TMPL_UNLESS NAME=\"mouseover\">\n"
-"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die "
-"Maus\n"
+"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die Maus\n"
 "über diesem Teil der Seite befindet. Dies Vorlage hat zwei Parameter:\n"
 "<ul>\n"
-"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das "
-"Popup-Fenster\n"
+"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das Popup-Fenster\n"
 "auslöst.\n"
-"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig "
-"sein,\n"
-"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter "
-"Benutzbarkeit\n"
-"sollte er aber nicht zu groß sein."
-"</ul>\n"
+"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig sein,\n"
+"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter Benutzbarkeit\n"
+"sollte er aber nicht zu groß sein.</ul>\n"
 "Beachte, dass Browser, die CSS nicht unterstützen, das Popup innerhalb\n"
 "der Seite anzeigen, eingerahmt durch eckige Klammern.\n"
 "</TMPL_UNLESS>\n"
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
-"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR "
-"popup></span><span class=\"paren\">]</span>\n"
+"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
-
diff --git a/po/underlays/basewiki/templates/popup.es.po b/po/underlays/basewiki/templates/popup.es.po
index 10fddb8c0..09680004c 100644
--- a/po/underlays/basewiki/templates/popup.es.po
+++ b/po/underlays/basewiki/templates/popup.es.po
@@ -6,19 +6,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-17 14:06+0200\n"
 "Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
 "Language-Team: None\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"
@@ -51,4 +69,3 @@ msgstr ""
 "<span class=\"popup\"><TMPL_VAR mouseover>\n"
 "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
-
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
index d2cd29118..b104d3177 100644
--- a/po/underlays/basewiki/templates/popup.fr.po
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -5,18 +5,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:30-0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2009-08-24 10:27+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "<TMPL_UNLESS NAME=\"mouseover\">\n"
+#| "Use this template to create a popup window that is displayed when the mouse\n"
+#| "is over part of the page. This template has two parameters:\n"
+#| "<ul>\n"
+#| "<li>`mouseover` - This is the text or other content that triggers the\n"
+#| "popup.\n"
+#| "<li>`popup` - This should be the content of the popup window. It can be\n"
+#| "anything, even images or a whole little wiki page, but should not be too\n"
+#| "large for good usability.\n"
+#| "</ul>\n"
+#| "Note that browsers that do not support the CSS will display the popup\n"
+#| "inline in the page, inside square brackets.\n"
+#| "</TMPL_UNLESS>\n"
+#| "<span class=\"popup\"><TMPL_VAR mouseover>\n"
+#| "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
+#| "</span>\n"
 msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Use this template to create a popup window that is displayed when the mouse\n"
 "is over part of the page. This template has two parameters:\n"
 "<ul>\n"