Refresh gettext files of underlays.

62 files changed, 1192 insertions, 622 deletions

diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
index 984c77603..3c9205c11 100644
--- a/po/underlays/basewiki/ikiwiki/directive.cs.po
+++ b/po/underlays/basewiki/ikiwiki/directive.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-22 07:39+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"
diff --git a/po/underlays/basewiki/ikiwiki/directive.da.po b/po/underlays/basewiki/ikiwiki/directive.da.po
index 3c134911d..b986cf949 100644
--- a/po/underlays/basewiki/ikiwiki/directive.da.po
+++ b/po/underlays/basewiki/ikiwiki/directive.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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po
index d969f8102..b74781bdc 100644
--- a/po/underlays/basewiki/ikiwiki/directive.de.po
+++ b/po/underlays/basewiki/ikiwiki/directive.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:16+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,8 +27,8 @@ msgid ""
 "with `!` and may contain parameters. The general form is:"
 msgstr ""
 "Anweisungen haben eine ähnliche Form wie ein [[ikiwiki/WikiLink]], "
-"allerdings beginnen sie mit `!` und sie können Parameter enthalten. "
-"Die allgemeine Form ist:"
+"allerdings beginnen sie mit `!` und sie können Parameter enthalten. Die "
+"allgemeine Form ist:"
 
 #. type: Plain text
 #, no-wrap
@@ -47,9 +48,9 @@ msgid ""
 "The quotes around values can be omitted if the value is a simple word.  "
 "Also, some directives may use parameters without values, for example:"
 msgstr ""
-"Die Anführungszeichen um die Werte können weggelassen werden, "
-"wenn der Wert ein einfaches Wort ist. Einige Anweisungen verwenden "
-"auch Parameter ohne Wert, zum Beispiel:"
+"Die Anführungszeichen um die Werte können weggelassen werden, wenn der Wert "
+"ein einfaches Wort ist. Einige Anweisungen verwenden auch Parameter ohne "
+"Wert, zum Beispiel:"
 
 #. type: Plain text
 #, no-wrap
@@ -61,8 +62,8 @@ msgid ""
 "A directive does not need to all be on one line, it can be wrapped to "
 "multiple lines if you like:"
 msgstr ""
-"Eine Anweisung muss nicht ganz in einer einzelnen Zeile stehen, "
-"sie kann auch auf mehrere Zeilen verteilt werden:"
+"Eine Anweisung muss nicht ganz in einer einzelnen Zeile stehen, sie kann "
+"auch auf mehrere Zeilen verteilt werden:"
 
 #. type: Plain text
 #, no-wrap
@@ -76,12 +77,12 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "Also, multiple lines of *quoted* text can be used for a value.  To allow "
-"quote marks inside the quoted text, delimit the block of text with "
-"triple-quotes:"
+"quote marks inside the quoted text, delimit the block of text with triple-"
+"quotes:"
 msgstr ""
-"Außerdem können mehrere Zeilen Text *in Anführungszeichen* für einen "
-"Wert verwendet werden. Um Anführungszeichen innerhalb des Werts zu "
-"ermöglichen, trenne den Textblock durch dreifache Anführungszeichen ab:"
+"Außerdem können mehrere Zeilen Text *in Anführungszeichen* für einen Wert "
+"verwendet werden. Um Anführungszeichen innerhalb des Werts zu ermöglichen, "
+"trenne den Textblock durch dreifache Anführungszeichen ab:"
 
 #. type: Plain text
 #, no-wrap
@@ -113,11 +114,11 @@ msgstr ""
 "Es gibt in ikiwiki auch eine ältere Syntax für Anweisungen, die ein "
 "Leerzeichen in erfordert, um sie von [[Wiki-Links|ikiwiki/wikilink]] zu "
 "unterscheiden. Diese Syntax hat mehrere Nachteile: Sie erfordert ein "
-"Leerzeichen nach Anweisungen ohne Parameter (so wie "
-"`\\[[pagecount ]]`), and sie verbietet Leerzeichen in "
-"[[Wiki-Links|ikiwiki/wikilink]]. Die oben gezeigte Syntax mit `!`-Präfix "
-"ist nun der Standard in ikiwiki. Die alte Syntax wird allerdings auch "
-"noch unterstützt, wenn die Option `prefix_directives` deaktiviert wird."
+"Leerzeichen nach Anweisungen ohne Parameter (so wie `\\[[pagecount ]]`), and "
+"sie verbietet Leerzeichen in [[Wiki-Links|ikiwiki/wikilink]]. Die oben "
+"gezeigte Syntax mit `!`-Präfix ist nun der Standard in ikiwiki. Die alte "
+"Syntax wird allerdings auch noch unterstützt, wenn die Option "
+"`prefix_directives` deaktiviert wird."
 
 #. type: Plain text
 #, no-wrap
@@ -133,5 +134,3 @@ msgstr ""
 #, no-wrap
 msgid "[[!listdirectives ]]\n"
 msgstr "[[!listdirectives ]]\n"
-
-
diff --git a/po/underlays/basewiki/ikiwiki/directive.es.po b/po/underlays/basewiki/ikiwiki/directive.es.po
index 91fa89e29..82e72c6c5 100644
--- a/po/underlays/basewiki/ikiwiki/directive.es.po
+++ b/po/underlays/basewiki/ikiwiki/directive.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-18 02: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"
@@ -25,8 +26,8 @@ msgid ""
 "Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
 "with `!` and may contain parameters. The general form is:"
 msgstr ""
-"Las directivas tienen una forma similar a un [[ikiwiki/WikiLink]], pero empiezan "
-"con `!` y pueden contener parámetros. La forma general es:"
+"Las directivas tienen una forma similar a un [[ikiwiki/WikiLink]], pero "
+"empiezan con `!` y pueden contener parámetros. La forma general es:"
 
 #. type: Plain text
 #, no-wrap
@@ -38,16 +39,16 @@ msgid ""
 "This gets expanded before the rest of the page is processed, and can be used "
 "to transform the page in various ways."
 msgstr ""
-"Esto se expande antes de que el resto de la página sea procesada, y puede utilizarse "
-"para transformar la página de diferentes maneras."
+"Esto se expande antes de que el resto de la página sea procesada, y puede "
+"utilizarse para transformar la página de diferentes maneras."
 
 #. type: Plain text
 msgid ""
 "The quotes around values can be omitted if the value is a simple word.  "
 "Also, some directives may use parameters without values, for example:"
 msgstr ""
-"Se pueden omitir las comillas en torno a un valor si éste consiste en una sola "
-"palabra. Además, algunas directivas pueden usar parámetros sin valores, "
+"Se pueden omitir las comillas en torno a un valor si éste consiste en una "
+"sola palabra. Además, algunas directivas pueden usar parámetros sin valores, "
 "como por ejemplo:"
 
 #. type: Plain text
@@ -78,9 +79,9 @@ msgid ""
 "quote marks inside the quoted text, delimit the block of text with triple-"
 "quotes:"
 msgstr ""
-"Además, se pueden usar múltiples líneas de texto *entrecomillado* como valor. Para "
-"que se permitan las comillas dentro del texto citado, delimite el bloque de "
-"texto con comillas triples:"
+"Además, se pueden usar múltiples líneas de texto *entrecomillado* como "
+"valor. Para que se permitan las comillas dentro del texto citado, delimite "
+"el bloque de texto con comillas triples:"
 
 #. type: Plain text
 #, no-wrap
@@ -109,14 +110,15 @@ msgid ""
 "syntax shown above as default.  However, ikiwiki still supports wikis using "
 "the older syntax, if the `prefix_directives` option is disabled."
 msgstr ""
-"ikiwiki tiene además una sintaxis más antigua para las directivas, que requiere "
-"un espacio en las directivas para distinguirlas de los [[wikilinks|ikiwiki/wikilink]]. "
-"Esta sintaxis tiene varias desventajas: requiere un espacio después de las "
-"directivas sin parámetros (tales como `\\[[pagecount ]]`), y prohíbe espacios en "
-"los [[wikilinks|ikiwiki/wikilink]]. ikiwiki proporciona ahora de manera predeterminada "
-"la sintaxis que utiliza el prefijo `!` mostrada arriba. Sin embargo, ikiwiki todavía "
-"es compatible con los wikis que utilizan la antigua sintaxis, si se desactiva la "
-"opción `prefix_directives`."
+"ikiwiki tiene además una sintaxis más antigua para las directivas, que "
+"requiere un espacio en las directivas para distinguirlas de los [[wikilinks|"
+"ikiwiki/wikilink]]. Esta sintaxis tiene varias desventajas: requiere un "
+"espacio después de las directivas sin parámetros (tales como `"
+"\\[[pagecount ]]`), y prohíbe espacios en los [[wikilinks|ikiwiki/"
+"wikilink]]. ikiwiki proporciona ahora de manera predeterminada la sintaxis "
+"que utiliza el prefijo `!` mostrada arriba. Sin embargo, ikiwiki todavía es "
+"compatible con los wikis que utilizan la antigua sintaxis, si se desactiva "
+"la opción `prefix_directives`."
 
 #. type: Plain text
 #, no-wrap
@@ -125,7 +127,8 @@ msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid "Here is a list of currently available directives in this wiki:"
-msgstr "Ésta es una lista de las directivas actualmente disponibles en este wiki:"
+msgstr ""
+"Ésta es una lista de las directivas actualmente disponibles en este wiki:"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/basewiki/ikiwiki/directive.fr.po b/po/underlays/basewiki/ikiwiki/directive.fr.po
index b4d7513c9..5d386862b 100644
--- a/po/underlays/basewiki/ikiwiki/directive.fr.po
+++ b/po/underlays/basewiki/ikiwiki/directive.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-25 11:25+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"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.cs.po b/po/underlays/basewiki/ikiwiki/formatting.cs.po
index 320667742..504ff88d8 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.cs.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-28 11:17+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"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.da.po b/po/underlays/basewiki/ikiwiki/formatting.da.po
index 2c4b67814..5dba227c6 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.da.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.da.po
@@ -7,10 +7,11 @@ 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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po
index a0171c348..8ee5bf3cc 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.de.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 13:35+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"
@@ -29,9 +30,9 @@ msgid ""
 "might write text for an email message. This style of text formatting is "
 "called [[MarkDown]], and it works like this:"
 msgstr ""
-"Text wird in diesem Wiki standardmäßig in einer Form geschrieben, die "
-"sehr stark dem ähnelt, wie man eine E-Mail schreibt. Dieser "
-"Formatierungs-Stil wird [[MarkDown]] genannt und funktioniert folgendermaßen:"
+"Text wird in diesem Wiki standardmäßig in einer Form geschrieben, die sehr "
+"stark dem ähnelt, wie man eine E-Mail schreibt. Dieser Formatierungs-Stil "
+"wird [[MarkDown]] genannt und funktioniert folgendermaßen:"
 
 #. type: Plain text
 msgid "Leave blank lines between paragraphs."
@@ -84,8 +85,8 @@ msgid ""
 "of the header:"
 msgstr ""
 "Um eine Überschrift zu erstellen, beginne eine Zeile mit einem oder mehreren "
-"`#`-Zeichen gefolgt von einem Leerzeichen und dem Text der Überschrift. "
-"Die Anzahl der `#` steuert die Größe der Überschriften:"
+"`#`-Zeichen gefolgt von einem Leerzeichen und dem Text der Überschrift. Die "
+"Anzahl der `#` steuert die Größe der Überschriften:"
 
 #. type: Title #
 #, no-wrap
@@ -142,8 +143,8 @@ msgstr ""
 #. type: Plain text
 msgid "To write a code block, indent each line with a tab or 4 spaces:"
 msgstr ""
-"Um einen Block mit Programmcode zu schreiben, rücke jede Zeile mit "
-"einem Tabulatorzeichen oder 4 Leerzeichen ein:"
+"Um einen Block mit Programmcode zu schreiben, rücke jede Zeile mit einem "
+"Tabulatorzeichen oder 4 Leerzeichen ein:"
 
 #. type: Plain text
 #, no-wrap
@@ -162,25 +163,24 @@ msgid ""
 "form \\[link text\\]\\(url\\)\n"
 msgstr ""
 "Um eine URL oder E-Mail-Adresse zu verlinken, kann man die\n"
-"URL einfach ein spitze Klammern schreiben: <<http://ikiwiki.info>>; "
-"man kann auch die Form \\[Link-Text\\]\\(URL)\\) verwenden.\n"
+"URL einfach ein spitze Klammern schreiben: <<http://ikiwiki.info>>; man kann auch die Form \\[Link-Text\\]\\(URL)\\) verwenden.\n"
 
 #. type: Plain text
 msgid ""
 "In addition to basic html formatting using [[MarkDown]], this wiki lets you "
 "use the following additional features:"
 msgstr ""
-"Zusätzlich zu der einfachen HTML-Formatierung mit [[MarkDown]] können "
-"in diesem Wiki die folgenden zusätzlichen Funktionen verwenden werden:"
+"Zusätzlich zu der einfachen HTML-Formatierung mit [[MarkDown]] können in "
+"diesem Wiki die folgenden zusätzlichen Funktionen verwenden werden:"
 
 #. type: Bullet: '* '
 msgid ""
 "To link to another page on the wiki, place the page's name inside double "
 "square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]."
 msgstr ""
-"Um eine andere Seite des Wikis zu verlinken, schreibe den Namen dieser "
-"Seite in doppelte eckige Klammern. Zum Beispiel kann man mit "
-"`\\[[WikiLink]]` auf [[WikiLink]] verweisen."
+"Um eine andere Seite des Wikis zu verlinken, schreibe den Namen dieser Seite "
+"in doppelte eckige Klammern. Zum Beispiel kann man mit `\\[[WikiLink]]` auf "
+"[[WikiLink]] verweisen."
 
 #. type: Plain text
 #, no-wrap
@@ -216,21 +216,19 @@ msgid ""
 "Create and fill out [[templates]] for repeated chunks of parameterized wiki "
 "text."
 msgstr ""
-"[[Vorlagen|templates]] erstellen und ausfüllen für wiederholte Blöcke "
-"von parametrisiertem Wiki-Text."
+"[[Vorlagen|templates]] erstellen und ausfüllen für wiederholte Blöcke von "
+"parametrisiertem Wiki-Text."
 
 #. type: Plain text
 #, no-wrap
 msgid ""
 "* Insert various [[directives|directive]] onto a page to perform useful\n"
 "  actions.\n"
-"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" "
-"then=\"\"\"\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
 msgstr ""
 "* Unterschiedliche [[Anweisungen|directives]] in eine Seite einfügen,\n"
 "  die nützliche Aktionen durchführen.\n"
-"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" "
-"then=\"\"\"\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
 #, no-wrap
@@ -287,13 +285,9 @@ msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 #. type: Plain text
 #, no-wrap
 msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
-msgstr ""
-"  Eine vollständige Liste der in diesem Wiki aktivierten "
-"[[Anweisungen|directive]]:\n"
+msgstr "  Eine vollständige Liste der in diesem Wiki aktivierten [[Anweisungen|directive]]:\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "  [[!listdirectives ]]\n"
 msgstr "  [[!listdirectives ]]\n"
-
-
diff --git a/po/underlays/basewiki/ikiwiki/formatting.es.po b/po/underlays/basewiki/ikiwiki/formatting.es.po
index 5e2549b8c..7b7de22df 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.es.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-12-10 22:00-0500\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.fr.po b/po/underlays/basewiki/ikiwiki/formatting.fr.po
index 05231364e..4a6fbfc47 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.fr.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-26 21:18+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@fre.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"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.cs.po b/po/underlays/basewiki/ikiwiki/markdown.cs.po
index 3217b009e..eeb976b05 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.cs.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-22 08:43+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"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.da.po b/po/underlays/basewiki/ikiwiki/markdown.da.po
index ba2eb5697..396b3477d 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.da.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.de.po b/po/underlays/basewiki/ikiwiki/markdown.de.po
index 1d1d84980..e9785c87a 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.de.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 13:36+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,8 +26,7 @@ msgid ""
 "the markup language used by this wiki by default."
 msgstr ""
 "[Markdown](http://daringfireball.net/projects/markdown/) ist eine minimale "
-"Sprache für Hervorhebungen, die sich an einfachem Text orientiert, wie er "
-"in "
+"Sprache für Hervorhebungen, die sich an einfachem Text orientiert, wie er in "
 "E-Mail-Nachrichten verwendet wird. Diese Hervorhebungssprache wird "
 "standardmäßig in diesem Wiki verwendet."
 
@@ -35,8 +35,7 @@ msgid ""
 "For documentation about the markdown syntax, see [[formatting]] and "
 "[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
 msgstr ""
-"Für die Dokumentation der Markdown-Syntax siehe "
-"[[Formatierung|formatting]] "
+"Für die Dokumentation der Markdown-Syntax siehe [[Formatierung|formatting]] "
 "und [Markdown: Syntax](http://daringfireball.net/projects/markdown/syntax)."
 
 #. type: Plain text
@@ -48,5 +47,3 @@ msgstr ""
 "Beachte dabei, dass [[WikiLinks|WikiLink]] und [[Anweisungen|directive]] "
 "nicht Teil der Markdown-Syntax sind: Sie sind die einzigen "
 "Formatierungsanweisungen, die dieses Wiki intern verarbeitet."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/markdown.es.po b/po/underlays/basewiki/ikiwiki/markdown.es.po
index daa61328b..4a62f6cfb 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.es.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-18 20:43+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"
@@ -26,17 +27,19 @@ msgid ""
 "markup language that resembles plain text as used in email messages. It is "
 "the markup language used by this wiki by default."
 msgstr ""
-"[Markdown](http://daringfireball.net/projects/markdown/) es un lenguaje mínimo "
-"de marcado que se parece al texto plano utilizado en los mensajes de correo electrónico. "
-"Es el lenguaje de marcado utilizado en este wiki de manera predeterminada."
+"[Markdown](http://daringfireball.net/projects/markdown/) es un lenguaje "
+"mínimo de marcado que se parece al texto plano utilizado en los mensajes de "
+"correo electrónico. Es el lenguaje de marcado utilizado en este wiki de "
+"manera predeterminada."
 
 #. type: Plain text
 msgid ""
 "For documentation about the markdown syntax, see [[formatting]] and "
 "[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
 msgstr ""
-"Si desea consultar documentación sobre la sintaxis de markdown, vea [[Aplicación_de_formato|formatting]] y "
-"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
+"Si desea consultar documentación sobre la sintaxis de markdown, vea "
+"[[Aplicación_de_formato|formatting]] y [Markdown: syntax](http://"
+"daringfireball.net/projects/markdown/syntax)."
 
 #. type: Plain text
 msgid ""
@@ -44,7 +47,6 @@ msgid ""
 "of the markdown syntax, and are the only bit of markup that this wiki "
 "handles internally."
 msgstr ""
-"Tenga en cuenta que los [[WikiLinks|WikiLink]] y las [[directivas|directive]] no son "
-"parte de la sintaxis de markdown, y son los únicos elementos de marcado "
-"que este wiki maneja internamente."
-
+"Tenga en cuenta que los [[WikiLinks|WikiLink]] y las [[directivas|"
+"directive]] no son parte de la sintaxis de markdown, y son los únicos "
+"elementos de marcado que este wiki maneja internamente."
diff --git a/po/underlays/basewiki/ikiwiki/markdown.fr.po b/po/underlays/basewiki/ikiwiki/markdown.fr.po
index 71dc70c64..de2aa34cc 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.fr.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-25 09: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"
@@ -35,8 +36,8 @@ msgid ""
 "[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
 msgstr ""
 "Référez vous à [[formatting]] et [Syntaxe Markdown](http://daringfireball."
-"net/projects/markdown/syntax) pour la documentation sur la syntaxe du langage "
-"markdown."
+"net/projects/markdown/syntax) pour la documentation sur la syntaxe du "
+"langage markdown."
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.cs.po b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
index 0ed80b952..c46085b21 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.cs.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
@@ -94,6 +94,7 @@ msgid ""
 "  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"
+"  number\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"
@@ -175,6 +176,13 @@ msgstr ""
 "obsahuje PageSpec, můžete použít „./“. To znamená, že „./něco“ na stránce „a/"
 "b“ najde stránku „a/něco“."
 
+#. type: Plain text
+msgid ""
+"To indicate the name of the page the PageSpec is used in, you can use a "
+"single dot. For example, `link(.)` matches all the pages linking to the page "
+"containing the PageSpec."
+msgstr ""
+
 #~ msgid ""
 #~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
 #~ msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index 42d05c78d..b49e6495e 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -98,6 +98,7 @@ msgid ""
 "  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"
+"  number\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"
@@ -179,6 +180,13 @@ msgstr ""
 "relativt til samme mappe som siden der indeholder pagespec'et kan du bruge "
 "\"./\". Eksempelvis passer \"./foo\" på siden \"a/b\" for siden \"a/foo\"."
 
+#. type: Plain text
+msgid ""
+"To indicate the name of the page the PageSpec is used in, you can use a "
+"single dot. For example, `link(.)` matches all the pages linking to the page "
+"containing the PageSpec."
+msgstr ""
+
 #~ msgid ""
 #~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
 #~ msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po
index 4fd1da8e9..e76c5da2a 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 13:39+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -95,6 +95,7 @@ msgid ""
 "  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"
+"  number\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"
@@ -176,6 +177,13 @@ msgstr ""
 "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`."
 
+#. type: Plain text
+msgid ""
+"To indicate the name of the page the PageSpec is used in, you can use a "
+"single dot. For example, `link(.)` matches all the pages linking to the page "
+"containing the PageSpec."
+msgstr ""
+
 #~ msgid ""
 #~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
 #~ msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.es.po b/po/underlays/basewiki/ikiwiki/pagespec.es.po
index 535bd0dba..6b194697c 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.es.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
@@ -98,6 +98,7 @@ msgid ""
 "  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"
+"  number\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"
@@ -182,6 +183,13 @@ msgstr ""
 "utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la "
 "página \"a/foo\"."
 
+#. type: Plain text
+msgid ""
+"To indicate the name of the page the PageSpec is used in, you can use a "
+"single dot. For example, `link(.)` matches all the pages linking to the page "
+"containing the PageSpec."
+msgstr ""
+
 #~ msgid ""
 #~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
 #~ msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index aef5c74bf..ec916b4ee 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-07-21 17:21+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -87,7 +87,39 @@ msgstr ""
 "suivantes :"
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "* \"`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"
 msgid ""
 "* \"`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"
@@ -97,6 +129,7 @@ msgid ""
 "  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"
+"  number\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"
@@ -207,6 +240,13 @@ msgstr ""
 "« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page "
 "« a/foo »."
 
+#. type: Plain text
+msgid ""
+"To indicate the name of the page the PageSpec is used in, you can use a "
+"single dot. For example, `link(.)` matches all the pages linking to the page "
+"containing the PageSpec."
+msgstr ""
+
 #~ msgid ""
 #~ "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
 #~ msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.cs.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.cs.po
new file mode 100644
index 000000000..873e47f06
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.cs.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc.  also work."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.da.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.da.po
new file mode 100644
index 000000000..873e47f06
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.da.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc.  also work."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
index dbc6dbb95..5e4184db4 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.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: 2011-05-05 20:04+0300\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"
@@ -15,12 +16,15 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Some [[directives|ikiwiki/directive]] that use "
-"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
-"pages are shown in. The following sort orders can be specified."
+"Some [[directives|ikiwiki/directive]] that use [[PageSpecs|ikiwiki/"
+"pagespec]] allow specifying the order that matching pages are shown in. The "
+"following sort orders can be specified."
 msgstr ""
 "[[!meta title=\"Sortierung\"]]\n"
-"Bei einigen der [[Anweisungen|ikiwiki/directive]], die [[PageSpecs|ikiwiki/pagespec]] verwenden, kann eine Reihenfolge angegeben werden, in der die ausgewählten Seiten angezeigt werden. Die folgenden Sortierreihenfolgen können angegeben werden:"
+"Bei einigen der [[Anweisungen|ikiwiki/directive]], die [[PageSpecs|ikiwiki/"
+"pagespec]] verwenden, kann eine Reihenfolge angegeben werden, in der die "
+"ausgewählten Seiten angezeigt werden. Die folgenden Sortierreihenfolgen "
+"können angegeben werden:"
 
 #. type: Bullet: '* '
 msgid "`age` - List pages from the most recently created to the oldest."
@@ -30,19 +34,51 @@ msgstr "`age` - Zeige die Seiten von der zuletzt angelegten zur ältesten."
 msgid "`mtime` - List pages with the most recently modified first."
 msgstr "`mtime` - Zeige die Seiten mit der zuletzt veränderten zuerst."
 
-#. type: Bullet: '* '
-msgid "`title` - Order by title."
-msgstr "`title` - Sortiere nach Titel."
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`title_natural` - Only available if [[!cpan Sort::Naturally]] is "
+#| "installed. Orders by title, but numbers in the title are treated as such, "
+#| "(\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
 msgid ""
-"`title_natural` - Only available if [[!cpan Sort::Naturally]] is "
-"installed. Orders by title, but numbers in the title are treated as such, "
-"(\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
 msgstr ""
-"`title_natural` - Nur verfügbar, wenn [[!cpan Sort::Naturally]] "
-"installiert ist. "
-"Sortiert nach Titel, aber Zahlen im Titel werden als solche behandelt"
+"`title_natural` - Nur verfügbar, wenn [[!cpan Sort::Naturally]] installiert "
+"ist. Sortiert nach Titel, aber Zahlen im Titel werden als solche behandelt"
 "(\"1 2 9 10 20\" statt \"1 10 2 20 9\")."
 
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" sortas=\"bar"
+"\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or the page name "
+"if no full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, "
+"etc.  also work."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
 
+#~ msgid "`title` - Order by title."
+#~ msgstr "`title` - Sortiere nach Titel."
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.es.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.es.po
new file mode 100644
index 000000000..873e47f06
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.es.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc.  also work."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.fr.po
new file mode 100644
index 000000000..873e47f06
--- /dev/null
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.fr.po
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc.  also work."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/searching.cs.po b/po/underlays/basewiki/ikiwiki/searching.cs.po
index 7734ff343..5aa0c5eb0 100644
--- a/po/underlays/basewiki/ikiwiki/searching.cs.po
+++ b/po/underlays/basewiki/ikiwiki/searching.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-28 11:17+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"
diff --git a/po/underlays/basewiki/ikiwiki/searching.da.po b/po/underlays/basewiki/ikiwiki/searching.da.po
index 02827e6b0..704c2f126 100644
--- a/po/underlays/basewiki/ikiwiki/searching.da.po
+++ b/po/underlays/basewiki/ikiwiki/searching.da.po
@@ -7,10 +7,11 @@ 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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/ikiwiki/searching.de.po b/po/underlays/basewiki/ikiwiki/searching.de.po
index ca50e05d4..f73981196 100644
--- a/po/underlays/basewiki/ikiwiki/searching.de.po
+++ b/po/underlays/basewiki/ikiwiki/searching.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:14+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"
@@ -38,8 +39,8 @@ msgid ""
 "powerful searches."
 msgstr ""
 "Wenn Suchen aktiviert ist, kann man wie erwartet Suchausdrücke in das "
-"Suchfeld eintragen. Es gibt einige spezielle Ausdrücke, um mächtigere "
-"Suchen zu erstellen."
+"Suchfeld eintragen. Es gibt einige spezielle Ausdrücke, um mächtigere Suchen "
+"zu erstellen."
 
 #. type: Bullet: '* '
 msgid "To match a phrase, enclose it in double quotes."
@@ -75,18 +76,16 @@ msgid ""
 "For example, \"-discussion\" will omit \"discussion\"."
 msgstr ""
 "Stelle einem Suchausdruck `-` voran, damit er nicht in den Ergebnissen "
-"auftaucht. "
-"Zum Beispiel wird `-Diskussion`alle Seiten mit \"Diskussion\" ausschließen."
+"auftaucht. Zum Beispiel wird `-Diskussion`alle Seiten mit \"Diskussion\" "
+"ausschließen."
 
 #. type: Bullet: '* '
 msgid "To search for a page with a given title, use \"title:foo\"."
 msgstr ""
-"Um nach einer Seite mit einem bestimmten Titel zu suchen, verwende "
-"`title:foo`."
+"Um nach einer Seite mit einem bestimmten Titel zu suchen, verwende `title:"
+"foo`."
 
 #. type: Bullet: '* '
 msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
 msgstr ""
 "Um nach Seiten mit einem Link auf \"bar\" zu suchen, verwende `link:bar`."
-
-
diff --git a/po/underlays/basewiki/ikiwiki/searching.es.po b/po/underlays/basewiki/ikiwiki/searching.es.po
index 7ab8cdca3..77c0abc85 100644
--- a/po/underlays/basewiki/ikiwiki/searching.es.po
+++ b/po/underlays/basewiki/ikiwiki/searching.es.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: searching\n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-12-06 18:16+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"
@@ -38,9 +39,9 @@ msgid ""
 "you'd expect. There are a few special things you can do to construct more "
 "powerful searches."
 msgstr ""
-"Si la búsqueda está habilitada, puede introducir el texto a buscar en el campo de búsqueda, tal "
-"y como cabría esperar. Hay además algunas reglas que puede usar para construir búsquedas más "
-"sofisticadas."
+"Si la búsqueda está habilitada, puede introducir el texto a buscar en el "
+"campo de búsqueda, tal y como cabría esperar. Hay además algunas reglas que "
+"puede usar para construir búsquedas más sofisticadas."
 
 #. type: Bullet: '* '
 msgid "To match a phrase, enclose it in double quotes."
@@ -48,31 +49,32 @@ msgstr "Para buscar una frase exacta, pongala entre comillas dobles."
 
 #. type: Bullet: '* '
 msgid "`AND` can be used to search for documents containing two expressions."
-msgstr "`AND` se puede usar para buscar documentos que contengan dos expresiones."
+msgstr ""
+"`AND` se puede usar para buscar documentos que contengan dos expresiones."
 
 #. type: Bullet: '* '
 msgid ""
 "`OR` can be used to search for documents containing either one of two "
 "expressions."
 msgstr ""
-"`OR` se puede usar para buscar documentos que contengan cualquiera de las dos "
-"expresiones."
+"`OR` se puede usar para buscar documentos que contengan cualquiera de las "
+"dos expresiones."
 
 #. type: Bullet: '* '
 msgid ""
 "Parentheses can be used to build up complicated search expressions. For "
 "example, \"(foo AND bar) OR (me AND you)\""
 msgstr ""
-"Los paréntesis se pueden usar para construir expresiones de búsqueda más complicadas. Por "
-"ejemplo, \"(foo AND bar) OR (me AND you)\""
+"Los paréntesis se pueden usar para construir expresiones de búsqueda más "
+"complicadas. Por ejemplo, \"(foo AND bar) OR (me AND you)\""
 
 #. type: Bullet: '* '
 msgid ""
 "Prefix a search term with \"-\" to avoid it from appearing in the results.  "
 "For example, \"-discussion\" will omit \"discussion\"."
 msgstr ""
-"Ponga \"-\" antes de un término de búsqueda para evitar que aparezca en los resultados.  "
-"Por ejemplo, \"-discussion\" omitirá \"discussion\"."
+"Ponga \"-\" antes de un término de búsqueda para evitar que aparezca en los "
+"resultados.  Por ejemplo, \"-discussion\" omitirá \"discussion\"."
 
 #. type: Bullet: '* '
 msgid "To search for a page with a given title, use \"title:foo\"."
@@ -80,5 +82,5 @@ msgstr "Para buscar una página con un determinado título, use \"title:foo\"."
 
 #. type: Bullet: '* '
 msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
-msgstr "Para buscar páginas que contengan un enlace a \"bar\", use \"link:bar\"."
-
+msgstr ""
+"Para buscar páginas que contengan un enlace a \"bar\", use \"link:bar\"."
diff --git a/po/underlays/basewiki/ikiwiki/searching.fr.po b/po/underlays/basewiki/ikiwiki/searching.fr.po
index 1fdee43dc..c71361e9e 100644
--- a/po/underlays/basewiki/ikiwiki/searching.fr.po
+++ b/po/underlays/basewiki/ikiwiki/searching.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-25 10:10+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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index 5df0b7176..88f089923 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-07-21 17:26+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -33,17 +33,17 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
-#| 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 "
 "nested as deeply as you'd like."
-msgstr "Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce wiki et il y a également un sous-répertoire subpage, qui contient `subpage/linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le souhaitez."
+msgstr ""
+"Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y "
+"les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce "
+"wiki et il y a également un sous-répertoire subpage, qui contient `subpage/"
+"linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le "
+"souhaitez."
 
 #. type: Plain text
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po
index 46918a42e..4be9f0ab0 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.cs.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-27 10:43+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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.da.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.da.po
index 01f854b94..7f6a0c73f 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.da.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
index 08ffd8cbf..49acd6523 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:21+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"
@@ -29,9 +30,9 @@ msgid ""
 msgstr ""
 "Um einen Link von oder zu einer [[Unterseite|SubPage]] anzulegen, kann man "
 "normalerweise einfache WikiLinks verwenden, ohne dass diese den Namen des "
-"Verzeichnisses enthalten, in dem die [[Unterseite|SubPage]] liegt. "
-"Ikiwiki läuft dann die Verzeichnishierarchie ab und sucht nach einer Seite, "
-"die zu dem angegebenen Link passt."
+"Verzeichnisses enthalten, in dem die [[Unterseite|SubPage]] liegt. Ikiwiki "
+"läuft dann die Verzeichnishierarchie ab und sucht nach einer Seite, die zu "
+"dem angegebenen Link passt."
 
 #. type: Plain text
 msgid ""
@@ -61,14 +62,14 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"You can also specify a link that contains a directory name, like "
-"\"FooBar/OtherPage\" to more exactly specify what page to link to. This is "
-"the only way to link to an unrelated [[SubPage]]."
+"You can also specify a link that contains a directory name, like \"FooBar/"
+"OtherPage\" to more exactly specify what page to link to. This is the only "
+"way to link to an unrelated [[SubPage]]."
 msgstr ""
-"Man kann auch einen Link mit Verzeichnisnamen angeben, etwa "
-"`FooBar/AndereSeite`, um genauer anzugeben auf welche Seite verwiesen werden "
-"soll. Nur so kann auf eine [[Unterseite|SubPage]] einer anderen Seite "
-"verwiesen werden."
+"Man kann auch einen Link mit Verzeichnisnamen angeben, etwa `FooBar/"
+"AndereSeite`, um genauer anzugeben auf welche Seite verwiesen werden soll. "
+"Nur so kann auf eine [[Unterseite|SubPage]] einer anderen Seite verwiesen "
+"werden."
 
 #. type: Plain text
 msgid ""
@@ -83,9 +84,9 @@ msgstr ""
 msgid ""
 "You can also use \"/\" at the start of a link, to specify exactly which page "
 "to link to, when there are multiple pages with similar names and the link "
-"goes to the wrong page by default. For example, linking from "
-"\"FooBar/SubPage\" to \"/OtherPage\" will link to the \"OtherPage\" in the "
-"root of the wiki, even if there is a \"FooBar/OtherPage\"."
+"goes to the wrong page by default. For example, linking from \"FooBar/SubPage"
+"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
+"even if there is a \"FooBar/OtherPage\"."
 msgstr ""
 "Man kann auch `/` am Anfang des Links verwenden, um die Zielseite genau zu "
 "spezifizieren, wenn es mehrere Seiten mit ähnlichen Namen gibt und der Link "
@@ -100,10 +101,8 @@ msgid ""
 "linking to a user's page in the userdir, to sign a comment. These links are "
 "checked for last of all."
 msgstr ""
-"Wenn das Wiki mit einem `userdir` konfiguriert ist, kann man außerdem "
-"die Seiten im Benutzerverzeichnis direkt verlinken, ohne einen Pfad "
-"anzugeben. Dadurch können leichter Links auf die Seite eines Benutzers "
-"gesetzt werden, etwa beim Signieren eines Kommentars. Diese Links "
-"werden als letzte von allen in Betracht gezogen."
-
-
+"Wenn das Wiki mit einem `userdir` konfiguriert ist, kann man außerdem die "
+"Seiten im Benutzerverzeichnis direkt verlinken, ohne einen Pfad anzugeben. "
+"Dadurch können leichter Links auf die Seite eines Benutzers gesetzt werden, "
+"etwa beim Signieren eines Kommentars. Diese Links werden als letzte von "
+"allen in Betracht gezogen."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po
index f81291fa9..676a89a1f 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-09-03 19:47+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,8 +28,8 @@ msgid ""
 "[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page "
 "that matches your link."
 msgstr ""
-"Para crear un enlace a o desde una [[subpágina|SubPage]], usualmente "
-"puede usar un [[WikiLink]] normal que no contenga el nombre del directorio "
+"Para crear un enlace a o desde una [[subpágina|SubPage]], usualmente puede "
+"usar un [[WikiLink]] normal que no contenga el nombre del directorio "
 "superior de la [[subpágina|SubPage]]. Ikiwiki desciende por la jerarquía de "
 "directorios buscando una página que se corresponda con su enlace."
 
@@ -38,9 +39,10 @@ msgid ""
 "prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to "
 "FooBar/OtherPage and finally to OtherPage in the root of the wiki."
 msgstr ""
-"Por ejemplo, si «FooBar/SubPagina» enlaza a «OtraPagina», ikiwiki preferirá primero "
-"dirigir el enlace a «FooBar/SubPagina/OtraPagina» si existe, a continuación a «FooBar/OtraPagina», "
-"y finalmente a «OtraPagina» en el directorio raíz del wiki."
+"Por ejemplo, si «FooBar/SubPagina» enlaza a «OtraPagina», ikiwiki preferirá "
+"primero dirigir el enlace a «FooBar/SubPagina/OtraPagina» si existe, a "
+"continuación a «FooBar/OtraPagina», y finalmente a «OtraPagina» en el "
+"directorio raíz del wiki."
 
 #. type: Plain text
 msgid ""
@@ -51,10 +53,10 @@ msgid ""
 "creation of a [[SubPage]] of FooBar."
 msgstr ""
 "Tenga en cuenta que esto significa que si un enlace en «FooBar/AlgunaPagina» "
-"a «OtraPagina» enlaza actualmente a «OtraPagina» en el directorio raíz del wiki, "
-"y se crea «FooBar/OtraPagina», el enlace _cambiará_ para dirigir a «FooBar/OtraPagina». "
-"Por otra parte, un enlace desde «BazBar» a «OtraPagina» no cambiará por esta creación "
-"de una [[subpágina|SubPage]] de «FooBar»."
+"a «OtraPagina» enlaza actualmente a «OtraPagina» en el directorio raíz del "
+"wiki, y se crea «FooBar/OtraPagina», el enlace _cambiará_ para dirigir a "
+"«FooBar/OtraPagina». Por otra parte, un enlace desde «BazBar» a «OtraPagina» "
+"no cambiará por esta creación de una [[subpágina|SubPage]] de «FooBar»."
 
 #. type: Plain text
 msgid ""
@@ -62,17 +64,18 @@ msgid ""
 "OtherPage\" to more exactly specify what page to link to. This is the only "
 "way to link to an unrelated [[SubPage]]."
 msgstr ""
-"También puede especificar un enlace que contenga un nombre de directorio, como "
-"«FooBar/OtraPagina» para especificar con más exactitud a qué página enlazar. Ésta es "
-"la única manera de enlazar a una [[subpágina|SubPage]] no relacionada."
+"También puede especificar un enlace que contenga un nombre de directorio, "
+"como «FooBar/OtraPagina» para especificar con más exactitud a qué página "
+"enlazar. Ésta es la única manera de enlazar a una [[subpágina|SubPage]] no "
+"relacionada."
 
 #. type: Plain text
 msgid ""
 "You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
 "or from BazBar/SubPage to \"FooBar/SubPage\"."
 msgstr ""
-"Puede utilizar esto, por ejemplo, para enlazar desde «BazBar» a «FooBar/SubPagina», "
-"o desde «BazBar/SubPagina» a «FooBar/SubPagina»."
+"Puede utilizar esto, por ejemplo, para enlazar desde «BazBar» a «FooBar/"
+"SubPagina», o desde «BazBar/SubPagina» a «FooBar/SubPagina»."
 
 #. type: Plain text
 msgid ""
@@ -82,11 +85,12 @@ msgid ""
 "\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, "
 "even if there is a \"FooBar/OtherPage\"."
 msgstr ""
-"También puede utilizar «/» al principio de un enlace, para especificar exactamente "
-"a qué página enlazar, cuando existen múltiples páginas con nombres similares y "
-"el enlace conduce a la página equivocada de manera predeterminada. Por ejemplo, "
-"crear un enlace desde «FooBar/SubPagina» a «/OtraPagina» conducirá a la «OtraPagina» "
-"del directorio raíz del wiki, incluso aunque haya una «FooBar/OtraPagina»."
+"También puede utilizar «/» al principio de un enlace, para especificar "
+"exactamente a qué página enlazar, cuando existen múltiples páginas con "
+"nombres similares y el enlace conduce a la página equivocada de manera "
+"predeterminada. Por ejemplo, crear un enlace desde «FooBar/SubPagina» a «/"
+"OtraPagina» conducirá a la «OtraPagina» del directorio raíz del wiki, "
+"incluso aunque haya una «FooBar/OtraPagina»."
 
 #. type: Plain text
 msgid ""
@@ -95,8 +99,8 @@ msgid ""
 "linking to a user's page in the userdir, to sign a comment. These links are "
 "checked for last of all."
 msgstr ""
-"Además, si el wiki está configurado con un directorio «userdir», puede enlazar a "
-"páginas dentro del «userdir» sin especificar una ruta hasta ellas. Esto ocurre para "
-"permitir la creación sencilla de enlaces a la página de un usuario en el «userdir», "
-"para firmar un comentario. Estos enlaces se comprueban en último lugar."
-
+"Además, si el wiki está configurado con un directorio «userdir», puede "
+"enlazar a páginas dentro del «userdir» sin especificar una ruta hasta ellas. "
+"Esto ocurre para permitir la creación sencilla de enlaces a la página de un "
+"usuario en el «userdir», para firmar un comentario. Estos enlaces se "
+"comprueban en último lugar."
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
index 36f7ef96f..6d2dedfe6 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-25 10:59+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"
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index 9998bbe54..8e46143d7 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-07-21 17:30+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -76,19 +76,20 @@ msgstr ""
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
 #. 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."
 msgid ""
 "If the file linked to by a WikiLink looks like an image, it will be "
 "displayed inline on the page."
-msgstr "Quand le fichier pointé par un WikiLink ressemble à une image, il est affiché au fil du texte sur la page."
+msgstr ""
+"Quand le fichier pointé par un WikiLink ressemble à une image, il est "
+"affiché au fil du texte sur la page."
 
 #. type: Plain text
 msgid ""
 "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 "Vous pouvez mettre une URL dans un WikiLink pour lier une page externe. Des adresses électroniques peuvent servir à créer des liens mailto."
+msgstr ""
+"Vous pouvez mettre une URL dans un WikiLink pour lier une page externe. Des "
+"adresses électroniques peuvent servir à créer des liens mailto."
 
 #~ msgid "Directives and WikiLinks"
 #~ msgstr "Directives et WikiLinks"
diff --git a/po/underlays/basewiki/index.cs.po b/po/underlays/basewiki/index.cs.po
index acc7dc756..694eecf04 100644
--- a/po/underlays/basewiki/index.cs.po
+++ b/po/underlays/basewiki/index.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 16:18+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"
diff --git a/po/underlays/basewiki/index.da.po b/po/underlays/basewiki/index.da.po
index 9da4c5021..120494490 100644
--- a/po/underlays/basewiki/index.da.po
+++ b/po/underlays/basewiki/index.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 18:53-0300\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/index.de.po b/po/underlays/basewiki/index.de.po
index c2dcdd341..5039e1b40 100644
--- a/po/underlays/basewiki/index.de.po
+++ b/po/underlays/basewiki/index.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-12 09:40+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"
@@ -20,10 +21,9 @@ msgstr "Willkommen in Ihrem neuen Wiki."
 #. type: Plain text
 msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
 msgstr ""
-"Alle Wikis sollten einen [[Sandkasten|SandBox]] haben, also hat dieses "
-"auch einen."
+"Alle Wikis sollten einen [[Sandkasten|SandBox]] haben, also hat dieses auch "
+"einen."
 
 #. type: Plain text
 msgid "This wiki is powered by [[ikiwiki]]."
 msgstr "Dieses Wiki wird mit [[ikiwiki]] betrieben."
-
diff --git a/po/underlays/basewiki/index.es.po b/po/underlays/basewiki/index.es.po
index 548e966e2..73b0b053a 100644
--- a/po/underlays/basewiki/index.es.po
+++ b/po/underlays/basewiki/index.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 21:03+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"
@@ -22,10 +23,9 @@ msgstr "Bienvenido a su nuevo wiki."
 #. type: Plain text
 msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
 msgstr ""
-"Se supone que todos los wikis tienen una [[Zona_de_pruebas|SandBox]], "
-"así que éste también la tiene."
+"Se supone que todos los wikis tienen una [[Zona_de_pruebas|SandBox]], así "
+"que éste también la tiene."
 
 #. type: Plain text
 msgid "This wiki is powered by [[ikiwiki]]."
 msgstr "Este wiki funciona con [[ikiwiki]]."
-
diff --git a/po/underlays/basewiki/index.fr.po b/po/underlays/basewiki/index.fr.po
index c63ce98cd..3a94ad016 100644
--- a/po/underlays/basewiki/index.fr.po
+++ b/po/underlays/basewiki/index.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-23 18:50+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"
diff --git a/po/underlays/basewiki/recentchanges.cs.po b/po/underlays/basewiki/recentchanges.cs.po
index 069faded7..2b7361b55 100644
--- a/po/underlays/basewiki/recentchanges.cs.po
+++ b/po/underlays/basewiki/recentchanges.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 16:43+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"
diff --git a/po/underlays/basewiki/recentchanges.da.po b/po/underlays/basewiki/recentchanges.da.po
index 1db466aff..c8df461d4 100644
--- a/po/underlays/basewiki/recentchanges.da.po
+++ b/po/underlays/basewiki/recentchanges.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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/recentchanges.de.po b/po/underlays/basewiki/recentchanges.de.po
index 88ff46fca..060116ac5 100644
--- a/po/underlays/basewiki/recentchanges.de.po
+++ b/po/underlays/basewiki/recentchanges.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-12 09: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"
@@ -35,4 +36,3 @@ msgid ""
 msgstr ""
 "[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
 "template=recentchanges show=0]]\n"
-
diff --git a/po/underlays/basewiki/recentchanges.es.po b/po/underlays/basewiki/recentchanges.es.po
index 1c5c461ca..2f2e6b29e 100644
--- a/po/underlays/basewiki/recentchanges.es.po
+++ b/po/underlays/basewiki/recentchanges.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 22:38+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,4 +38,3 @@ msgid ""
 msgstr ""
 "[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n"
 "template=recentchanges show=0]]\n"
-
diff --git a/po/underlays/basewiki/recentchanges.fr.po b/po/underlays/basewiki/recentchanges.fr.po
index 8f12155bb..92de01f4d 100644
--- a/po/underlays/basewiki/recentchanges.fr.po
+++ b/po/underlays/basewiki/recentchanges.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-23 09:32+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"
diff --git a/po/underlays/basewiki/sandbox.cs.po b/po/underlays/basewiki/sandbox.cs.po
index 778a61419..6eaeaf216 100644
--- a/po/underlays/basewiki/sandbox.cs.po
+++ b/po/underlays/basewiki/sandbox.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 16:56+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"
diff --git a/po/underlays/basewiki/sandbox.da.po b/po/underlays/basewiki/sandbox.da.po
index 7930e512d..4b6d4dc26 100644
--- a/po/underlays/basewiki/sandbox.da.po
+++ b/po/underlays/basewiki/sandbox.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: 2011-05-05 20:04+0300\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"
diff --git a/po/underlays/basewiki/sandbox.de.po b/po/underlays/basewiki/sandbox.de.po
index bb1b837c6..fd68f8ccc 100644
--- a/po/underlays/basewiki/sandbox.de.po
+++ b/po/underlays/basewiki/sandbox.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:14+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"
@@ -15,10 +16,12 @@ msgstr ""
 
 #. type: Plain text
 #, fuzzy
-msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgid ""
+"This is the SandBox, a page anyone can edit to learn how to use the wiki."
 msgstr ""
 "[[!meta title=\"Sandkasten\"]]\n"
-"Dies ist der Sandkasten: Eine Seite die jeder bearbeiten kann, um zu lernen wie man das Wiki benutzt."
+"Dies ist der Sandkasten: Eine Seite die jeder bearbeiten kann, um zu lernen "
+"wie man das Wiki benutzt."
 
 #. type: Plain text
 msgid "Here's a paragraph."
@@ -88,4 +91,3 @@ msgstr "Eintrag"
 #. type: Plain text
 msgid "[[ikiwiki/WikiLink]]"
 msgstr "[[ikiwiki/WikiLink]]"
-
diff --git a/po/underlays/basewiki/sandbox.es.po b/po/underlays/basewiki/sandbox.es.po
index 12bf5347d..ab9a2d3f4 100644
--- a/po/underlays/basewiki/sandbox.es.po
+++ b/po/underlays/basewiki/sandbox.es.po
@@ -6,18 +6,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2009-08-15 18:56-0300\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-16 19:15+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
-msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
-msgstr "Esta es la Zona de Pruebas («SandBox»), una página que cualquiera puede editar para aprender a usar el wiki."
+msgid ""
+"This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr ""
+"Esta es la Zona de Pruebas («SandBox»), una página que cualquiera puede "
+"editar para aprender a usar el wiki."
 
 #. type: Plain text
 msgid "Here's a paragraph."
@@ -87,4 +91,3 @@ msgstr "elemento"
 #. type: Plain text
 msgid "[[ikiwiki/WikiLink]]"
 msgstr "[[ikiwiki/WikiLink]]"
-
diff --git a/po/underlays/basewiki/sandbox.fr.po b/po/underlays/basewiki/sandbox.fr.po
index ab24b8c7a..848ccfe3a 100644
--- a/po/underlays/basewiki/sandbox.fr.po
+++ b/po/underlays/basewiki/sandbox.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-08-26 21:07+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: french <debian-l10n-french@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
@@ -16,7 +17,9 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This is the SandBox, a page anyone can edit to learn how to use the wiki."
-msgstr "Voici le bac à sable, une page que tout le monde peut éditer pour apprendre à se servir du wiki."
+msgstr ""
+"Voici le bac à sable, une page que tout le monde peut éditer pour apprendre "
+"à se servir du wiki."
 
 #. type: Plain text
 msgid "Here's a paragraph."
diff --git a/po/underlays/basewiki/shortcuts.cs.po b/po/underlays/basewiki/shortcuts.cs.po
index 15d523011..b451894a2 100644
--- a/po/underlays/basewiki/shortcuts.cs.po
+++ b/po/underlays/basewiki/shortcuts.cs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,7 +48,10 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Tato stránka určuje, které zkratky bude wiki podporovat."
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgid ""
+"[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 #. type: Bullet: '* '
@@ -64,15 +68,26 @@ 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\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index b9498d997..d7aa328cf 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
@@ -51,7 +52,10 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Denne side styrer hvilke genveje wikien understøtter."
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgid ""
+"[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 #. type: Bullet: '* '
@@ -68,15 +72,26 @@ 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\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
diff --git a/po/underlays/basewiki/shortcuts.de.po b/po/underlays/basewiki/shortcuts.de.po
index abfa26bdc..23d1f20f9 100644
--- a/po/underlays/basewiki/shortcuts.de.po
+++ b/po/underlays/basewiki/shortcuts.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: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:14+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"
@@ -47,7 +48,10 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Diese Seite bestimmt, welche Abkürzungen das Wiki unterstützt."
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgid ""
+"[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 #. type: Bullet: '* '
@@ -60,35 +64,47 @@ 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\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"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=\"Debian 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=\"Debian bug "
-"#%s\"]]"
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug #"
+"%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
-"desc=\"debian-%s@lists.debian.org\"]]"
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
 msgstr ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
-"desc=\"debian-%s@lists.debian.org\"]]"
+"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"\"debian-%s@lists.debian.org\"]]"
 
 #. type: Bullet: '* '
 msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
@@ -103,185 +119,130 @@ 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 ""
-"[[!shortcut name=debrt "
-"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
 msgstr ""
-"[[!shortcut name=debrt "
-"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
+"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
+"\"]]"
 
 #. 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"
+"  * 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=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=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=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=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=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=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=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"
-"* [[!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"
+"* [[!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"
-"  * Verwendung: `\\[[!debss Paket]]`, `\\[[!debss Paket#Version]]`, or "
-"`\\[[!debss Paket/Version]]`.  Details unter http://snapshot.debian.net.\n"
+"  * Verwendung: `\\[[!debss Paket]]`, `\\[[!debss Paket#Version]]`, or `\\[[!debss Paket/Version]]`.  Details unter http://snapshot.debian.net.\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=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=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=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=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=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=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=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"
-"* [[!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"
+"* [[!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 ""
 "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 "
-"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, "
-"non-encoded text. The optional `desc` parameter controls the description of "
-"the link."
+"\"%s\" is replaced with the text passed to the named shortcut, after [[!"
+"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded "
+"text. The optional `desc` parameter controls the description of the link."
 msgstr ""
-"Um eine neue Abkürzung hinzuzufügen, verwende die "
-"shortcut-[[Anweisung|ikiwiki/directive]]. "
-"In der URL wird `%s` durch den der Abkürzung übergebenen Text in "
-"URL-Kodierung ersetzt. Außerdem wird `%S` durch den unveränderten Text ersetzt. "
-"Der optionale Parameter  `desc` steuert die Beschriftung der Verknüpfung."
+"Um eine neue Abkürzung hinzuzufügen, verwende die shortcut-[[Anweisung|"
+"ikiwiki/directive]]. In der URL wird `%s` durch den der Abkürzung "
+"übergebenen Text in URL-Kodierung ersetzt. Außerdem wird `%S` durch den "
+"unveränderten Text ersetzt. Der optionale Parameter  `desc` steuert die "
+"Beschriftung der Verknüpfung."
 
 #. type: Plain text
 msgid ""
-"Remember that the `name` you give the shortcut will become a new "
-"[[ikiwiki/directive]].  Avoid using a `name` that conflicts with an existing "
+"Remember that the `name` you give the shortcut will become a new [[ikiwiki/"
+"directive]].  Avoid using a `name` that conflicts with an existing "
 "directive.  These directives also accept a `desc` parameter that will "
 "override the one provided at definition time."
 msgstr ""
-"Denke daran, dass der angegebene `name` eine neue "
-"[[Anweisung|ikiwiki/directive]] wird.  Deshalb sollte man es vermeiden, "
-"einen Namen zu verwenden, der mit einer bestehenden "
-"[[Anweisung|ikiwiki/directive]] in Konflikt steht. Diese Anweisungen akzeptieren "
-"einen optionalen Parameter `desc`, der statt des Werts aus der Definition "
-"verwendet wird."
+"Denke daran, dass der angegebene `name` eine neue [[Anweisung|ikiwiki/"
+"directive]] wird.  Deshalb sollte man es vermeiden, einen Namen zu "
+"verwenden, der mit einer bestehenden [[Anweisung|ikiwiki/directive]] in "
+"Konflikt steht. Diese Anweisungen akzeptieren einen optionalen Parameter "
+"`desc`, der statt des Werts aus der Definition verwendet wird."
 
 #. 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 "
-"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
-"will include your shortcut in the standard underlay."
+"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://"
+"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include "
+"your shortcut in the standard underlay."
 msgstr ""
-"Wenn Sie eine Idee für eine Abkürzung haben, die auch andere nützlich "
-"finden könnten, können Sie diese auf der [Abkürzungs-Seite des "
-"ikiwiki-Wiki](http://ikiwiki.info/shortcuts/) eintragen, damit künftige "
-"Versionen von ikiwiki diese Abkürzung standardmäßig zur Verfügung stellen."
-
-
+"Wenn Sie eine Idee für eine Abkürzung haben, die auch andere nützlich finden "
+"könnten, können Sie diese auf der [Abkürzungs-Seite des ikiwiki-Wiki](http://"
+"ikiwiki.info/shortcuts/) eintragen, damit künftige Versionen von ikiwiki "
+"diese Abkürzung standardmäßig zur Verfügung stellen."
diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po
index 10c26023f..49cbb8cc0 100644
--- a/po/underlays/basewiki/shortcuts.es.po
+++ b/po/underlays/basewiki/shortcuts.es.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +49,10 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Esta página controla qué atajos de enlace se pueden hacer en el wiki."
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgid ""
+"[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 #. type: Bullet: '* '
@@ -65,15 +69,26 @@ 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\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
@@ -240,9 +255,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 ""
diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po
index b4755d4d7..aeb2dae09 100644
--- a/po/underlays/basewiki/shortcuts.fr.po
+++ b/po/underlays/basewiki/shortcuts.fr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-03-14 22:09+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +47,10 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Cette page définit les raccourcis connus par ce wiki."
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
+msgid ""
+"[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 #. type: Bullet: '* '
@@ -63,25 +67,34 @@ 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\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
+"wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid ""
+"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"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=\"Debian bug #"
 "%s\"]]"
-msgstr "[[!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\"]]"
 
 #. type: Bullet: '* '
 msgid ""
@@ -119,41 +132,6 @@ 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"
diff --git a/po/underlays/basewiki/templates.cs.po b/po/underlays/basewiki/templates.cs.po
index 5ac5cdb89..5689dde0f 100644
--- a/po/underlays/basewiki/templates.cs.po
+++ b/po/underlays/basewiki/templates.cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
@@ -18,15 +18,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise this site."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"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."
+"you can fully customise its appearance, and avoid duplicate content."
 msgstr ""
 
 #. type: Plain text
@@ -74,7 +66,7 @@ msgstr ""
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
@@ -84,21 +76,32 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"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."
+"Template pages are regular wiki pages that are used as templates for other "
+"pages."
 msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "default content for new pages"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Templates are files that can be filled out and inserted into pages in the "
+#| "wiki."
+msgid ""
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"template pages to be filled out and inserted into other pages in the wiki."
 msgstr ""
+"Šablony jsou soubory, které je možno vyplnit a vložit do stránek ve wiki."
+
+#. 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: Plain text
 msgid ""
@@ -116,6 +119,10 @@ msgid ""
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
+msgid "These template pages are currently available:"
+msgstr ""
+
+#. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -123,7 +130,7 @@ msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!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"
+"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 "sort=title template=titlepage]]\n"
@@ -131,19 +138,34 @@ msgstr ""
 #. type: Title ##
 #, fuzzy, no-wrap
 #| msgid "Using a template"
-msgid "wiki templates"
+msgid "template files"
 msgstr "Používání šablon"
 
 #. type: Plain text
 msgid ""
-"These templates are used to build the wiki. The aim is to keep almost all "
-"html out of ikiwiki and in the templates."
+"Template files are unlike template pages in that they have the extension `."
+"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
+"They can contain html that would not normally be allowed on a wiki page."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised template files can also be placed inside the \"templates/"
+"\" directory in your wiki's source -- files placed there override ones in "
+"the `templatedir`."
+msgstr ""
+
+#. type: Plain text
+msgid "Here is a full list of the template files used:"
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise to change the look and feel of Ikiwiki.  [[!if test="
+"\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
@@ -177,7 +199,7 @@ msgid ""
 "* `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"
+"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 
@@ -198,20 +220,17 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\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 ""
+#~ "\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 "
@@ -231,8 +250,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "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 ""
+#~ "        \\[[!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."
diff --git a/po/underlays/basewiki/templates.da.po b/po/underlays/basewiki/templates.da.po
index 533c582cc..5d7fcd90c 100644
--- a/po/underlays/basewiki/templates.da.po
+++ b/po/underlays/basewiki/templates.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -23,15 +23,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise this site."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"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."
+"you can fully customise its appearance, and avoid duplicate content."
 msgstr ""
 
 #. type: Plain text
@@ -78,7 +70,7 @@ msgstr ""
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
@@ -88,21 +80,31 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"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."
+"Template pages are regular wiki pages that are used as templates for other "
+"pages."
 msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "default content for new pages"
-msgstr ""
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Templates are files that can be filled out and inserted into pages in the "
+#| "wiki."
+msgid ""
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"template pages to be filled out and inserted into other pages in the wiki."
+msgstr "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
+
+#. 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: Plain text
 msgid ""
@@ -120,6 +122,10 @@ msgid ""
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
+msgid "These template pages are currently available:"
+msgstr ""
+
+#. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -127,7 +133,7 @@ msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!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"
+"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 "sort=title template=titlepage]]\n"
@@ -135,19 +141,34 @@ msgstr ""
 #. type: Title ##
 #, fuzzy, no-wrap
 #| msgid "Using a template"
-msgid "wiki templates"
+msgid "template files"
 msgstr "Brug af skabelon"
 
 #. type: Plain text
 msgid ""
-"These templates are used to build the wiki. The aim is to keep almost all "
-"html out of ikiwiki and in the templates."
+"Template files are unlike template pages in that they have the extension `."
+"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
+"They can contain html that would not normally be allowed on a wiki page."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised template files can also be placed inside the \"templates/"
+"\" directory in your wiki's source -- files placed there override ones in "
+"the `templatedir`."
+msgstr ""
+
+#. type: Plain text
+msgid "Here is a full list of the template files used:"
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise to change the look and feel of Ikiwiki.  [[!if test="
+"\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
@@ -181,7 +202,7 @@ msgid ""
 "* `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"
+"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 
@@ -201,12 +222,6 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\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 "
@@ -215,8 +230,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ 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 ""
+#~ "\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 "
@@ -237,8 +256,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "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 ""
+#~ "        \\[[!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."
diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
index c31957002..f47344f8a 100644
--- a/po/underlays/basewiki/templates.de.po
+++ b/po/underlays/basewiki/templates.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-03-14 15:15+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -17,15 +17,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise this site."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"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."
+"you can fully customise its appearance, and avoid duplicate content."
 msgstr ""
 
 #. type: Plain text
@@ -73,7 +65,7 @@ msgstr ""
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
@@ -83,21 +75,33 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"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."
+"Template pages are regular wiki pages that are used as templates for other "
+"pages."
 msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "default content for new pages"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Templates are files that can be filled out and inserted into pages in the "
+#| "wiki."
+msgid ""
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"template pages to be filled out and inserted into other pages in the wiki."
 msgstr ""
+"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
+"können."
+
+#. 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: Plain text
 msgid ""
@@ -115,6 +119,10 @@ msgid ""
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
+msgid "These template pages are currently available:"
+msgstr ""
+
+#. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -122,7 +130,7 @@ msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!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"
+"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 "sort=title template=titlepage]]\n"
@@ -130,19 +138,34 @@ msgstr ""
 #. type: Title ##
 #, fuzzy, no-wrap
 #| msgid "Using a template"
-msgid "wiki templates"
+msgid "template files"
 msgstr "Verwenden einer Vorlage"
 
 #. type: Plain text
 msgid ""
-"These templates are used to build the wiki. The aim is to keep almost all "
-"html out of ikiwiki and in the templates."
+"Template files are unlike template pages in that they have the extension `."
+"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
+"They can contain html that would not normally be allowed on a wiki page."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised template files can also be placed inside the \"templates/"
+"\" directory in your wiki's source -- files placed there override ones in "
+"the `templatedir`."
+msgstr ""
+
+#. type: Plain text
+msgid "Here is a full list of the template files used:"
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise to change the look and feel of Ikiwiki.  [[!if test="
+"\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
@@ -176,7 +199,7 @@ msgid ""
 "* `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"
+"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 
@@ -198,13 +221,6 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\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 "
@@ -213,8 +229,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ 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 ""
+#~ "\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 "
@@ -236,8 +256,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "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 ""
+#~ "        \\[[!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."
diff --git a/po/underlays/basewiki/templates.es.po b/po/underlays/basewiki/templates.es.po
index 22042e318..fdec15871 100644
--- a/po/underlays/basewiki/templates.es.po
+++ b/po/underlays/basewiki/templates.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\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"
@@ -19,15 +19,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise this site."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"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."
+"you can fully customise its appearance, and avoid duplicate content."
 msgstr ""
 
 #. type: Plain text
@@ -75,7 +67,7 @@ msgstr ""
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
@@ -85,21 +77,33 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"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."
+"Template pages are regular wiki pages that are used as templates for other "
+"pages."
 msgstr ""
 
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "default content for new pages"
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "Templates are files that can be filled out and inserted into pages in the "
+#| "wiki."
+msgid ""
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"template pages to be filled out and inserted into other pages in the wiki."
 msgstr ""
+"Las plantillas son archivos que se pueden completar e insertar en páginas "
+"del wiki."
+
+#. 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: Plain text
 msgid ""
@@ -117,6 +121,10 @@ msgid ""
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
+msgid "These template pages are currently available:"
+msgstr ""
+
+#. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -124,7 +132,7 @@ msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!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"
+"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 "sort=title template=titlepage]]\n"
@@ -132,19 +140,34 @@ msgstr ""
 #. type: Title ##
 #, fuzzy, no-wrap
 #| msgid "Using a template"
-msgid "wiki templates"
+msgid "template files"
 msgstr "Uso de una plantilla"
 
 #. type: Plain text
 msgid ""
-"These templates are used to build the wiki. The aim is to keep almost all "
-"html out of ikiwiki and in the templates."
+"Template files are unlike template pages in that they have the extension `."
+"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
+"They can contain html that would not normally be allowed on a wiki page."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised template files can also be placed inside the \"templates/"
+"\" directory in your wiki's source -- files placed there override ones in "
+"the `templatedir`."
+msgstr ""
+
+#. type: Plain text
+msgid "Here is a full list of the template files used:"
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise to change the look and feel of Ikiwiki.  [[!if test="
+"\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
@@ -178,7 +201,7 @@ msgid ""
 "* `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"
+"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 
@@ -199,13 +222,6 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\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 "
@@ -214,8 +230,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ 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 ""
+#~ "\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 "
@@ -236,8 +256,12 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\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 ""
+#~ "        \\[[!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]]."
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 715ef92ff..edd5df090 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
 "PO-Revision-Date: 2010-07-22 17:30+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -15,27 +15,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "[[Ikiwiki]] uses many templates for many purposes. By editing its "
+#| "templates, you can fully customise this site."
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise this site."
+"you can fully customise its appearance, and avoid duplicate content."
 msgstr ""
 "[[Ikiwiki]] se sert de modèles dans beaucoup de cas. En modifiant ces "
 "modèles, vous pouvez « personnaliser » ce wiki."
 
 #. type: Plain text
 msgid ""
-"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 ""
-"Les modèles sont situés dans le répertoire `/usr/share/ikiwiki/templates`. "
-"Le paramètre `templatedir` peut être utilisé pour commencer la recherche "
-"dans un autre répertoire. Des modèles personnalisés peuvent être placés dans "
-"dans le sous-répertoire `templates/` du répertoire source du wiki."
-
-#. type: Plain text
-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:"
@@ -45,18 +37,12 @@ msgstr ""
 "que vous avez besoin de savoir :"
 
 #. type: Bullet: '* '
-#| 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 d'une variable, sans que la syntaxe wiki soit "
 "convertie en HTML, utilisez `<TMPL_VAR variable>`."
 
 #. type: Bullet: '* '
-#| msgid ""
-#| "To make a block of text conditional on a variable being set use `<TMPL_IF "
-#| "NAME=\"variable\">text</TMPL_IF>`."
 msgid ""
 "To make a block of text conditional on a variable being set use `<TMPL_IF "
 "variable>text</TMPL_IF>`."
@@ -65,9 +51,6 @@ msgstr ""
 "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>`"
 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>`"
@@ -77,10 +60,14 @@ msgstr ""
 "TMPL_IF>`"
 
 #. type: Plain text
-#, no-wrap
-#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| "[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+#| "and enabled(inline)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
+msgstr ""
+"[[!if test=\"enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
 #, no-wrap
@@ -89,9 +76,24 @@ msgstr "pages modèles"
 
 #. type: Plain text
 msgid ""
+"Template pages are regular wiki pages that are used as templates for other "
+"pages."
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(template)\" then=\"\"\"\n"
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
 "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."
+"template pages to be filled out and inserted into other pages in the wiki."
 msgstr ""
 "La directive [[!iki ikiwiki/directive/template desc=\"template\"]] permet "
 "d'utiliser des pages de wiki comme modèles. Ces modèles peuvent être remplis "
@@ -99,15 +101,9 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
 
-#. type: Title ##
-#, no-wrap
-msgid "default content for new pages"
-msgstr "contenu par défaut des nouvelles pages"
-
 #. type: Plain text
 msgid ""
 "The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
@@ -120,7 +116,6 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgid ""
 "[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
 "and enabled(inline)\" then=\"\"\"\n"
@@ -129,43 +124,106 @@ msgstr ""
 "and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
-#, no-wrap
+msgid "These template pages are currently available:"
+msgstr ""
+
+#. type: Plain text
+#, fuzzy, no-wrap
 #| msgid ""
-#| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-#| "sort=title template=titlepage]]\n"
+#| "[[!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"
 msgid ""
 "[[!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"
+"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
 "feeds=no archive=yes sort=title template=titlepage\n"
 "rootpage=templates postformtext=\"Ajouter un nouveau modèle :\"]]\n"
 
 #. type: Title ##
-#, no-wrap
-#| msgid "Using a template"
-msgid "wiki templates"
-msgstr "modèles du wiki"
+#, fuzzy, no-wrap
+#| msgid "template pages"
+msgid "template files"
+msgstr "pages modèles"
 
 #. type: Plain text
 msgid ""
-"These templates are used to build the wiki. The aim is to keep almost all "
-"html out of ikiwiki and in the templates."
+"Template files are unlike template pages in that they have the extension `."
+"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
+"They can contain html that would not normally be allowed on a wiki page."
+msgstr ""
+
+#. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "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."
+msgid ""
+"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised template files can also be placed inside the \"templates/"
+"\" directory in your wiki's source -- files placed there override ones in "
+"the `templatedir`."
+msgstr ""
+"Les modèles sont situés dans le répertoire `/usr/share/ikiwiki/templates`. "
+"Le paramètre `templatedir` peut être utilisé pour commencer la recherche "
+"dans un autre répertoire. Des modèles personnalisés peuvent être placés dans "
+"dans le sous-répertoire `templates/` du répertoire source du wiki."
+
+#. type: Plain text
+msgid "Here is a full list of the template files used:"
 msgstr ""
-"Ces modèles permettent la construction du wiki. Le but est de mettre presque "
-"tout le formatage HTML dans des modèles, hors de ikiwiki."
 
 #. type: Bullet: '* '
+#, fuzzy
+#| msgid ""
+#| "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+#| "template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise to change the look and feel of Ikiwiki.  [[!if test="
+"\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 "`page.tmpl` - permet d'afficher toutes les pages normales du wiki. C'est le "
 "principal modèle à modifier. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 
 #. type: Plain text
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "  (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"
 msgid ""
 "  (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate directive\"]]\n"
 "  can be used to make a page use a different template than `page.tmpl`.)\"\"\"]]\n"
@@ -195,7 +253,7 @@ msgid ""
 "* `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"
+"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 "  (La directive [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate\"]]\n"
@@ -232,6 +290,20 @@ msgstr ""
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
+#~ msgid "default content for new pages"
+#~ msgstr "contenu par défaut des nouvelles pages"
+
+#~| msgid "Using a template"
+#~ msgid "wiki templates"
+#~ msgstr "modèles du wiki"
+
+#~ msgid ""
+#~ "These templates are used to build the wiki. The aim is to keep almost all "
+#~ "html out of ikiwiki and in the templates."
+#~ msgstr ""
+#~ "Ces modèles permettent la construction du wiki. Le but est de mettre "
+#~ "presque tout le formatage HTML dans des modèles, hors de ikiwiki."
+
 #~ msgid ""
 #~ "[[!if test=\"enabled(template)\"\n"
 #~ "then=\"This wiki has templates **enabled**.\"\n"