Cambios recientes a este wiki:

updated PO files
diff --git a/po/underlays/basewiki/ikiwiki/directive.sv.po b/po/underlays/basewiki/ikiwiki/directive.sv.po
index 3bc3de4..ed34b56 100644
--- a/po/underlays/basewiki/ikiwiki/directive.sv.po
+++ b/po/underlays/basewiki/ikiwiki/directive.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
+"POT-Creation-Date: 2013-05-19 00:40+0000\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"
@@ -66,7 +66,7 @@ msgstr ""
 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:"
+"double-quotes or triple-single-quotes:"
 msgstr ""
 
 #. type: Plain text
@@ -82,8 +82,31 @@ msgstr ""
 msgid "\"bar\""
 msgstr ""
 
-#. type: Bullet: '	3. '
-msgid "\"baz\""
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t3. \"baz\"\n"
+"\t\"\"\" othertext='''\n"
+"\t1. 'quux'\n"
+"\t2. \"foo\"\n"
+"\t''']]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you want to put text with triple quotes into a parameter value, you can "
+"use perl-style here-doc syntax, even nesting it like this:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive text=<<OUTER\n"
+"\t[[!otherdirective <<INNER\n"
+"\tinner text\n"
+"\tINNER]]\n"
+"\touter text\n"
+"\tOUTER]]\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.sv.po b/po/underlays/basewiki/ikiwiki/pagespec.sv.po
index 4eb63bd..9b79139 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.sv.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-18 22:29+0000\n"
+"POT-Creation-Date: 2013-05-19 00:40+0000\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"
@@ -80,6 +80,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"
@@ -145,3 +146,10 @@ msgid ""
 "directory of the page containing the pagespec, you can use \"./\". For "
 "example, \"./foo\" on page \"a/b\" matches page \"a/foo\"."
 msgstr ""
+
+#. 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 ""
diff --git a/po/underlays/basewiki/sandbox.sv.po b/po/underlays/basewiki/sandbox.sv.po
index f4bea71..ac8988d 100644
--- a/po/underlays/basewiki/sandbox.sv.po
+++ b/po/underlays/basewiki/sandbox.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
+"POT-Creation-Date: 2013-05-19 00:40+0000\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"
@@ -82,3 +82,8 @@ msgstr ""
 #. type: Plain text
 msgid "[[ikiwiki/WikiLink]]"
 msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid "[[!calendar type=\"month\" pages=\"blog/*\"]]\n"
+msgstr ""
diff --git a/po/underlays/basewiki/shortcuts.sv.po b/po/underlays/basewiki/shortcuts.sv.po
index 4bbb0d0..ae90541 100644
--- a/po/underlays/basewiki/shortcuts.sv.po
+++ b/po/underlays/basewiki/shortcuts.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
+"POT-Creation-Date: 2013-05-19 00:40+0000\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"
@@ -42,7 +42,8 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr ""
 
 #. type: Bullet: '* '
-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 ""
 
 #. type: Bullet: '* '
@@ -50,23 +51,24 @@ msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
+msgid "[[!shortcut name=gmap url=\"https://maps.google.com/maps?q=%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgid ""
+"[[!shortcut name=gmsg url=\"https://groups.google.com/groups?selm=%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
+msgid "[[!shortcut name=wikipedia url=\"https://en.wikipedia.org/wiki/%W\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
+msgid "[[!shortcut name=wiktionary url=\"https://en.wiktionary.org/wiki/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
@@ -77,7 +79,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
+"[[!shortcut name=deblist url=\"https://lists.debian.org/debian-%s\" desc="
 "\"debian-%s@lists.debian.org\"]]"
 msgstr ""
 
@@ -95,7 +97,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
-"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+"[[!shortcut name=debmsg url=\"https://lists.debian.org/msgid-search/%s\"]]"
 msgstr ""
 
 #. type: Bullet: '* '
@@ -107,15 +109,15 @@ 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=debss url=\"http://snapshot.debian.org/package/%s/\"]]\n"
+"  * Usage: `\\[[!debss package]]` or `\\[[!debss package/version]]`.  See <http://snapshot.debian.org/> for details.\n"
+"* [[!shortcut name=debwiki url=\"https://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=gnomebug url=\"https://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"https://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=gnulist url=\"https://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"

(Diff truncated)
update from ikiwiki master
diff --git a/po/underlays/basewiki/ikiwiki.pot b/po/underlays/basewiki/ikiwiki.pot
index ffea264..2e4e01e 100644
--- a/po/underlays/basewiki/ikiwiki.pot
+++ b/po/underlays/basewiki/ikiwiki.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-05-17 03:21+0000\n"
+"POT-Creation-Date: 2012-08-25 11:30-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"
diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
index c3bc5be..15ea272 100644
--- a/po/underlays/basewiki/ikiwiki/directive.cs.po
+++ b/po/underlays/basewiki/ikiwiki/directive.cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
+"POT-Creation-Date: 2012-08-25 11:30-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"
@@ -73,10 +73,15 @@ msgstr ""
 "\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| 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:"
 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:"
+"double-quotes or triple-single-quotes:"
 msgstr ""
 "Více řádků *uvozeného* textu lze použít i v hodnotě. Chcete-li v uvozeném "
 "textu použít (anglické) uvozovky, obklopte text trojitými uvozovkami:"
@@ -94,9 +99,32 @@ msgstr "\"něco\""
 msgid "\"bar\""
 msgstr "\"cosi\""
 
-#. type: Bullet: '	3. '
-msgid "\"baz\""
-msgstr "\"cokoliv\""
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t3. \"baz\"\n"
+"\t\"\"\" othertext='''\n"
+"\t1. 'quux'\n"
+"\t2. \"foo\"\n"
+"\t''']]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you want to put text with triple quotes into a parameter value, you can "
+"use perl-style here-doc syntax, even nesting it like this:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive text=<<OUTER\n"
+"\t[[!otherdirective <<INNER\n"
+"\tinner text\n"
+"\tINNER]]\n"
+"\touter text\n"
+"\tOUTER]]\n"
+msgstr ""
 
 #. type: Plain text
 msgid ""
@@ -129,3 +157,6 @@ msgstr "Následuje seznam direktiv povolených v této wiki:"
 #, no-wrap
 msgid "[[!listdirectives ]]\n"
 msgstr "[[!listdirectives ]]\n"
+
+#~ msgid "\"baz\""
+#~ msgstr "\"cokoliv\""
diff --git a/po/underlays/basewiki/ikiwiki/directive.da.po b/po/underlays/basewiki/ikiwiki/directive.da.po
index 95bffaf..6a7cc1c 100644
--- a/po/underlays/basewiki/ikiwiki/directive.da.po
+++ b/po/underlays/basewiki/ikiwiki/directive.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2012-08-25 11:30-0300\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -77,10 +77,15 @@ msgstr ""
 "\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| 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:"
 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:"
+"double-quotes or triple-single-quotes:"
 msgstr ""
 "Flere linjer *citeret* tekst kan også bruges som værdi. For at tillade "
 "citation i den citerede tekst skal du adskille blokken med trippel-citat:"
@@ -98,9 +103,32 @@ msgstr "\"foo\""
 msgid "\"bar\""
 msgstr "\"bar\""
 
-#. type: Bullet: '	3. '
-msgid "\"baz\""
-msgstr "\"baz\""
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t3. \"baz\"\n"
+"\t\"\"\" othertext='''\n"
+"\t1. 'quux'\n"
+"\t2. \"foo\"\n"
+"\t''']]\n"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"If you want to put text with triple quotes into a parameter value, you can "
+"use perl-style here-doc syntax, even nesting it like this:"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t\\[[!directive text=<<OUTER\n"
+"\t[[!otherdirective <<INNER\n"
+"\tinner text\n"
+"\tINNER]]\n"
+"\touter text\n"
+"\tOUTER]]\n"
+msgstr ""
 
 #. type: Plain text
 msgid ""
@@ -134,3 +162,6 @@ msgstr ""
 #, no-wrap
 msgid "[[!listdirectives ]]\n"
 msgstr "[[!listdirectives ]]\n"
+
+#~ msgid "\"baz\""
+#~ msgstr "\"baz\""
diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po
index 9690f00..91bd000 100644
--- a/po/underlays/basewiki/ikiwiki/directive.de.po
+++ b/po/underlays/basewiki/ikiwiki/directive.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
+"POT-Creation-Date: 2012-08-25 11:30-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"
@@ -75,10 +75,15 @@ msgstr ""
 "\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 
 #. type: Plain text
+#, fuzzy
+#| 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:"
 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:"
+"double-quotes or triple-single-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, "
@@ -97,9 +102,32 @@ msgstr "\"foo\""
 msgid "\"bar\""
 msgstr "\"bar\""
 
-#. type: Bullet: '	3. '
-msgid "\"baz\""
-msgstr "\"baz\""
+#. type: Plain text
+#, no-wrap
+msgid ""
+"\t3. \"baz\"\n"

(Diff truncated)
Merge remote-tracking branch 'ikiwiki/master'
updated PO files
diff --git a/po/underlays/discussion.cs.po b/po/underlays/discussion.cs.po
new file mode 100644
index 0000000..297a79a
--- /dev/null
+++ b/po/underlays/discussion.cs.po
@@ -0,0 +1,75 @@
+# 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: 2012-08-25 15:27+0000\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: Title ##
+#, no-wrap
+msgid "Requests for translation"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Czech: Hi Joey, could you please enable Czech (cs) language?"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "It seems I'm the only translator for this language"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"I have the translation of basewiki already ready, so after the activation I "
+"will just commit it and fix any issues I will notice in the live "
+"environment."
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"I have just enough of time to keep basewiki updated (expecting it not to "
+"change too much)"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "I *might* have a look at the other pages in the future, but nothing promised"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> Done, thanks! Please let me know when it's checked. Hope I got the name "
+"right BTW. --[[Joey]]\n"
+"> \n"
+"> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge "
+"<brother@bsnet.se>\n"
+" * I will most probably be the only one doing the translation but I'll "
+"mention it to the others in debian-l10n-swedish and see if anyone is up to "
+"it.\n"
+" * I have done a clone for the wiki and will do most changes there. \n"
+" * For time I am not to stressed for the time being. \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> Done, thanks! Please let me know when you have a translation of the\n"
+"> basewiki. --[[Joey]]\n"
+msgstr ""
diff --git a/po/underlays/discussion.da.po b/po/underlays/discussion.da.po
new file mode 100644
index 0000000..297a79a
--- /dev/null
+++ b/po/underlays/discussion.da.po
@@ -0,0 +1,75 @@
+# 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: 2012-08-25 15:27+0000\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: Title ##
+#, no-wrap
+msgid "Requests for translation"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Czech: Hi Joey, could you please enable Czech (cs) language?"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "It seems I'm the only translator for this language"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"I have the translation of basewiki already ready, so after the activation I "
+"will just commit it and fix any issues I will notice in the live "
+"environment."
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid ""
+"I have just enough of time to keep basewiki updated (expecting it not to "
+"change too much)"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "I *might* have a look at the other pages in the future, but nothing promised"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> Done, thanks! Please let me know when it's checked. Hope I got the name "
+"right BTW. --[[Joey]]\n"
+"> \n"
+"> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge "
+"<brother@bsnet.se>\n"
+" * I will most probably be the only one doing the translation but I'll "
+"mention it to the others in debian-l10n-swedish and see if anyone is up to "
+"it.\n"
+" * I have done a clone for the wiki and will do most changes there. \n"
+" * For time I am not to stressed for the time being. \n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
+"> Done, thanks! Please let me know when you have a translation of the\n"
+"> basewiki. --[[Joey]]\n"
+msgstr ""
diff --git a/po/underlays/discussion.de.po b/po/underlays/discussion.de.po
new file mode 100644
index 0000000..297a79a
--- /dev/null
+++ b/po/underlays/discussion.de.po
@@ -0,0 +1,75 @@
+# 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: 2012-08-25 15:27+0000\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: Title ##
+#, no-wrap
+msgid "Requests for translation"
+msgstr ""
+
+#. type: Bullet: '* '
+msgid "Czech: Hi Joey, could you please enable Czech (cs) language?"
+msgstr ""
+
+#. type: Bullet: '  * '
+msgid "It seems I'm the only translator for this language"
+msgstr ""
+
+#. type: Bullet: '  * '

(Diff truncated)
rename discussion page to work around that po/discussion bug
diff --git a/po/underlays/discussion.mdwn b/po/underlays/discussion.mdwn
new file mode 100644
index 0000000..bd2e8a9
--- /dev/null
+++ b/po/underlays/discussion.mdwn
@@ -0,0 +1,21 @@
+## Requests for translation
+
+* Czech: Hi Joey, could you please enable Czech (cs) language?
+
+  * It seems I'm the only translator for this language
+  * I have the translation of basewiki already ready, so after the activation
+    I will just commit it and fix any issues I will notice in the live environment.
+  * I have just enough of time to keep basewiki updated (expecting it not to change too much)
+  * I *might* have a look at the other pages in the future, but nothing promised
+
+> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
+> 
+> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] 
+
+* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge <brother@bsnet.se>
+ * I will most probably be the only one doing the translation but I'll mention it to the others in debian-l10n-swedish and see if anyone is up to it.
+ * I have done a clone for the wiki and will do most changes there. 
+ * For time I am not to stressed for the time being. 
+
+> Done, thanks! Please let me know when you have a translation of the
+> basewiki. --[[Joey]]
diff --git a/po/underlays/index/discussion.mdwn b/po/underlays/index/discussion.mdwn
deleted file mode 100644
index bd2e8a9..0000000
--- a/po/underlays/index/discussion.mdwn
+++ /dev/null
@@ -1,21 +0,0 @@
-## Requests for translation
-
-* Czech: Hi Joey, could you please enable Czech (cs) language?
-
-  * It seems I'm the only translator for this language
-  * I have the translation of basewiki already ready, so after the activation
-    I will just commit it and fix any issues I will notice in the live environment.
-  * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages in the future, but nothing promised
-
-> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
-> 
-> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] 
-
-* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge <brother@bsnet.se>
- * I will most probably be the only one doing the translation but I'll mention it to the others in debian-l10n-swedish and see if anyone is up to it.
- * I have done a clone for the wiki and will do most changes there. 
- * For time I am not to stressed for the time being. 
-
-> Done, thanks! Please let me know when you have a translation of the
-> basewiki. --[[Joey]]

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index c7af32f..ec923ee 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:29+0000\n"
+"POT-Creation-Date: 2012-08-25 15:24+0000\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"
@@ -63,12 +63,12 @@ msgstr ""
 #. type: Bullet: '2. '
 msgid ""
 "Is your language listed as one of the available translations above? If not, "
-"[[Joey]] needs to enable it. Edit this page and request it be enabled. "
-"Include the name of your language as it should be displayed, and the two "
-"letter language code. Saying something about the translation resources you "
-"have available will help. Is it just you, or will there be a whole team? Do "
-"you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"[[Joey]] needs to enable it. Edit the [[discussion]] page and request it be "
+"enabled. Include the name of your language as it should be displayed, and "
+"the two letter language code. Saying something about the translation "
+"resources you have available will help. Is it just you, or will there be a "
+"whole team? Do you have just a little time to help, or do you want to commit "
+"to translating the whole thing?"
 msgstr ""
 
 #. type: Bullet: '3. '
@@ -76,8 +76,7 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go "
-"up! [download casino](http://www.casinoluckywin.com/en/download/)"
+"form, editing a PO file. Save and watch the percent translated numbers go up!"
 msgstr ""
 
 #. type: Bullet: '4. '
@@ -103,13 +102,16 @@ msgstr ""
 msgid "Run `git commit -a` to commit your changes."
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '   * '
+msgid ""
+"Run `git push` to push your changes back to this wiki. It will automatically "
+"update!"
+msgstr ""
+
+#. type: Bullet: '5. '
 msgid ""
-"   * Run `git push` to push your changes back to this wiki. It will\n"
-"     automatically update!\n"
-"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
-"   know so he can activate your translation in the next ikiwiki release.\n"
+"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
+"so he can activate your translation in the next ikiwiki release."
 msgstr ""
 
 #. type: Bullet: '6. '
@@ -123,15 +125,12 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
-" never\n"
-"be directly merged into master. Remember to merge master into it from time\n"
-"to time. After merging in master, the translatable underlays can be updated\n"
-"by running `cd po && make underlays`. Then check in any new po and pot\n"
-"files to the l10n branch.\n"
-"(Similarly, that should never be run on the master branch.)\n"
+"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
+"directly merged into master. Remember to merge master into it from time to "
+"time. After merging in master, the translatable underlays can be updated by "
+"running `cd po && make underlays`. Then check in any new po and pot files to "
+"the l10n branch.  (Similarly, that should never be run on the master branch.)"
 msgstr ""
 
 #. type: Plain text
@@ -143,60 +142,6 @@ msgstr ""
 
 #. type: Title ##
 #, no-wrap
-msgid "Requests for translation"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "Czech: Hi Joey, could you please enable Czech (cs) language?"
-msgstr ""
-
-#. type: Bullet: '  * '
-msgid "It seems I'm the only translator for this language"
-msgstr ""
-
-#. type: Bullet: '  * '
-msgid ""
-"I have the translation of basewiki already ready, so after the activation I "
-"will just commit it and fix any issues I will notice in the live environment."
-msgstr ""
-
-#. type: Bullet: '  * '
-msgid ""
-"I have just enough of time to keep basewiki updated (expecting it not to "
-"change too much)"
-msgstr ""
-
-#. type: Bullet: '  * '
-msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
-"> \n"
-"> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge <brother@bsnet.se>\n"
-" * I will most probably be the only one doing the translation but I'll mention it to the others in debian-l10n-swedish and see if anyone is up to it.\n"
-" * I have done a clone for the wiki and will do most changes there. \n"
-" * For time I am not to stressed for the time being. \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"> Done, thanks! Please let me know when you have a translation of the\n"
-"> basewiki. --[[Joey]]\n"
-msgstr ""
-
-#. type: Title ##
-#, no-wrap
 msgid "Translation hints"
 msgstr ""
 
@@ -263,7 +208,11 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
+msgstr ""
+
+#. type: Plain text
+#, no-wrap
+msgid ""
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
@@ -282,7 +231,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 1ba3c46..88423e8 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 14:29+0000\n"
+"POT-Creation-Date: 2012-08-25 15:24+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -67,12 +67,12 @@ msgstr ""
 #. type: Bullet: '2. '
 msgid ""
 "Is your language listed as one of the available translations above? If not, "
-"[[Joey]] needs to enable it. Edit this page and request it be enabled. "
-"Include the name of your language as it should be displayed, and the two "
-"letter language code. Saying something about the translation resources you "
-"have available will help. Is it just you, or will there be a whole team? Do "
-"you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"[[Joey]] needs to enable it. Edit the [[discussion]] page and request it be "
+"enabled. Include the name of your language as it should be displayed, and "
+"the two letter language code. Saying something about the translation "
+"resources you have available will help. Is it just you, or will there be a "
+"whole team? Do you have just a little time to help, or do you want to commit "
+"to translating the whole thing?"
 msgstr ""
 

(Diff truncated)
break out discussion to its own page, as the index page is locked
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index dd2c11b..42b468c 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -21,7 +21,7 @@ these steps:
    > modification, are permitted under any circumstances. No warranty.
 
 2. Is your language listed as one of the available translations above?
-   If not, [[Joey]] needs to enable it. Edit this page and request
+   If not, [[Joey]] needs to enable it. Edit the [[discussion]] page and request
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
    Do you have just a little time to help, or do you want to commit
@@ -63,28 +63,6 @@ When receiving a translation via this site, the po files have to be copied
 over to master by hand. This way, only translations that are in a
 consistent/complete state can land in master.
 
-## Requests for translation
-
-* Czech: Hi Joey, could you please enable Czech (cs) language?
-
-  * It seems I'm the only translator for this language
-  * I have the translation of basewiki already ready, so after the activation
-    I will just commit it and fix any issues I will notice in the live environment.
-  * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages in the future, but nothing promised
-
-> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
-> 
-> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] 
-
-* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge <brother@bsnet.se>
- * I will most probably be the only one doing the translation but I'll mention it to the others in debian-l10n-swedish and see if anyone is up to it.
- * I have done a clone for the wiki and will do most changes there. 
- * For time I am not to stressed for the time being. 
-
-> Done, thanks! Please let me know when you have a translation of the
-> basewiki. --[[Joey]]
-
 ## Translation hints
 
 * This page does not need to be translated. :-)
diff --git a/po/underlays/index/discussion.mdwn b/po/underlays/index/discussion.mdwn
new file mode 100644
index 0000000..bd2e8a9
--- /dev/null
+++ b/po/underlays/index/discussion.mdwn
@@ -0,0 +1,21 @@
+## Requests for translation
+
+* Czech: Hi Joey, could you please enable Czech (cs) language?
+
+  * It seems I'm the only translator for this language
+  * I have the translation of basewiki already ready, so after the activation
+    I will just commit it and fix any issues I will notice in the live environment.
+  * I have just enough of time to keep basewiki updated (expecting it not to change too much)
+  * I *might* have a look at the other pages in the future, but nothing promised
+
+> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
+> 
+> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] 
+
+* Svenska: Hi Joey, could you please enable Swedish (sv)? //Martin Bagge <brother@bsnet.se>
+ * I will most probably be the only one doing the translation but I'll mention it to the others in debian-l10n-swedish and see if anyone is up to it.
+ * I have done a clone for the wiki and will do most changes there. 
+ * For time I am not to stressed for the time being. 
+
+> Done, thanks! Please let me know when you have a translation of the
+> basewiki. --[[Joey]]

remove spam
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index bc3bfef..dd2c11b 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,5 +1,5 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
-translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki 
+translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki
 is the set of pages that are copied into every wiki it powers.
 
 Most of the English pages on this wiki are locked. You cannot edit them.
@@ -20,7 +20,7 @@ these steps:
    > Redistribution and use in source and compiled forms, with or without
    > modification, are permitted under any circumstances. No warranty.
 
-2. Is your language listed as one of the available translations above? 
+2. Is your language listed as one of the available translations above?
    If not, [[Joey]] needs to enable it. Edit this page and request
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
@@ -31,8 +31,7 @@ these steps:
    page on this wiki that is less than 100% translated to your language,
    go to the translated version of the page, and edit it. You'll be dumped
    into a web form, editing a PO file. Save and watch the percent translated
-   numbers go up! [download casino](http://www.casinoluckywin.com/en/download/)
-
+   numbers go up!
 
 4. After a while you might get tired of the web form and want a real text
    editor, or even a specialized po file editor. No problem, this wiki can
@@ -45,6 +44,7 @@ these steps:
    * Run `git commit -a` to commit your changes.
    * Run `git push` to push your changes back to this wiki. It will
      automatically update!
+
 5. If you get a useful percentage of the basewiki translated, let [[Joey]]
    know so he can activate your translation in the next ikiwiki release.
 
@@ -52,8 +52,7 @@ these steps:
 
 ## Instructions for Joey
 
-This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)
- never
+This branch of ikiwiki is diverged from ikiwiki master, and should never
 be directly merged into master. Remember to merge master into it from time
 to time. After merging in master, the translatable underlays can be updated
 by running `cd po && make underlays`. Then check in any new po and pot
@@ -72,7 +71,7 @@ consistent/complete state can land in master.
   * I have the translation of basewiki already ready, so after the activation
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages  in the future, but nothing promised
+  * I *might* have a look at the other pages in the future, but nothing promised
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 
@@ -114,7 +113,7 @@ on the Czech page returning an error about nonexistent page
 > Hmm, I don't see the problem when I go to
 > <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>
 > I am redirected to the English cutpaste page, no 404. --[[Joey]] 
-[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)
+
 > > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)
 > > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)
 > > you might get the error. (And the localized version will be
@@ -125,7 +124,7 @@ on the Czech page returning an error about nonexistent page
 > > but to <http://l10n.ikiwiki.info/ikiwiki/directive/cutpaste/>
 
 >>> Ah, ok. Then this should only be a problem on this wiki. The
->>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)
+>>> pages redirect to '/ikiwiki/directive/cutpaste', and that version
 >>> of the page is the one shipped in an ikiwiki release (not the one
 >>> this site lets you translate), and so is not translated to French/Czech
 >>> yet. So I think this will clear itself up once I add those translations

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 7d50e78..c7af32f 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\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"
@@ -123,12 +123,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"
+"(Similarly, that should never be run on the master branch.)\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index ca1d708..1ba3c46 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -127,12 +127,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"
+"(Similarly, that should never be run on the master branch.)\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 7d50e78..c7af32f 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\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"
@@ -123,12 +123,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"
+"(Similarly, that should never be run on the master branch.)\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index b16a87f..2c7844f 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\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"
@@ -122,12 +122,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"
+"(Similarly, that should never be run on the master branch.)\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 7d50e78..c7af32f 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\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"
@@ -123,12 +123,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"
+"(Similarly, that should never be run on the master branch.)\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 7d50e78..c7af32f 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:10+0000\n"
+"POT-Creation-Date: 2012-08-17 14:29+0000\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"
@@ -123,12 +123,15 @@ msgid "Instructions for Joey"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
 msgid ""
-"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
-"directly merged into master. Remember to merge master into it from time to "
-"time. After merging in master, the translatable underlays can be updated by "
-"running `cd po && make underlays`. Then check in any new po and pot files to "
-"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+"This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)\n"
+" never\n"
+"be directly merged into master. Remember to merge master into it from time\n"
+"to time. After merging in master, the translatable underlays can be updated\n"
+"by running `cd po && make underlays`. Then check in any new po and pot\n"
+"files to the l10n branch.\n"

(Diff truncated)
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 9123f84..bc3bfef 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -52,7 +52,8 @@ these steps:
 
 ## Instructions for Joey
 
-This branch of ikiwiki is diverged from ikiwiki master, and should never
+This branch of ikiwiki is diverged from ikiwiki master, and should [Groupage Shipping](http://www.telsgroup.com/services/groupage_cargo_transportation_services/)
+ never
 be directly merged into master. Remember to merge master into it from time
 to time. After merging in master, the translatable underlays can be updated
 by running `cd po && make underlays`. Then check in any new po and pot

updated PO files
diff --git a/po/underlays/basewiki/ikiwiki.pot b/po/underlays/basewiki/ikiwiki.pot
index f289383..ffea264 100644
--- a/po/underlays/basewiki/ikiwiki.pot
+++ b/po/underlays/basewiki/ikiwiki.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-15 21:32+0000\n"
+"POT-Creation-Date: 2012-05-17 03:21+0000\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"
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 0d137c6..7d50e78 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\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"
@@ -76,7 +76,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index caddd89..ca1d708 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -80,7 +80,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 0d137c6..7d50e78 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\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"
@@ -76,7 +76,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index d127345..b16a87f 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\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"
@@ -75,7 +75,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 0d137c6..7d50e78 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\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"
@@ -76,7 +76,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 0d137c6..7d50e78 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-08-17 14:08+0000\n"
+"POT-Creation-Date: 2012-08-17 14:10+0000\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"
@@ -76,7 +76,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [download casino](http://www.casinoluckywin.com/en/download/)"
 msgstr ""
 
 #. type: Bullet: '4. '

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index b87e32e..9123f84 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -31,7 +31,8 @@ these steps:
    page on this wiki that is less than 100% translated to your language,
    go to the translated version of the page, and edit it. You'll be dumped
    into a web form, editing a PO file. Save and watch the percent translated
-   numbers go up!
+   numbers go up! [download casino](http://www.casinoluckywin.com/en/download/)
+
 
 4. After a while you might get tired of the web form and want a real text
    editor, or even a specialized po file editor. No problem, this wiki can

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 5f68ea6..0d137c6 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\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"
@@ -278,7 +278,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 4f9bbf8..caddd89 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -282,7 +282,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 5f68ea6..0d137c6 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\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"
@@ -278,7 +278,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 6b49e8b..d127345 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\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"
@@ -277,7 +277,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 5f68ea6..0d137c6 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\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"
@@ -278,7 +278,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 5f68ea6..0d137c6 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-07-09 14:38+0000\n"
+"POT-Creation-Date: 2012-08-17 14:08+0000\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"
@@ -278,7 +278,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 ">>> Ah, ok. Then this should only be a problem on this wiki. The\n"
-">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version\n"
+">>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)\n"
 ">>> of the page is the one shipped in an ikiwiki release (not the one\n"
 ">>> this site lets you translate), and so is not translated to French/Czech\n"
 ">>> yet. So I think this will clear itself up once I add those translations\n"

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index c2b31a4..b87e32e 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -20,7 +20,7 @@ these steps:
    > Redistribution and use in source and compiled forms, with or without
    > modification, are permitted under any circumstances. No warranty.
 
-2. Is your language listed as one of the available translations above?
+2. Is your language listed as one of the available translations above? 
    If not, [[Joey]] needs to enable it. Edit this page and request
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
@@ -123,7 +123,7 @@ on the Czech page returning an error about nonexistent page
 > > but to <http://l10n.ikiwiki.info/ikiwiki/directive/cutpaste/>
 
 >>> Ah, ok. Then this should only be a problem on this wiki. The
->>> pages redirect to '/ikiwiki/directive/cutpaste', and that version
+>>> pages redirect to '/ikiwiki/directive/cutpaste', and that version [Minsk arena](http://www.hockeychamp2014.com/minsk-arena.html)
 >>> of the page is the one shipped in an ikiwiki release (not the one
 >>> this site lets you translate), and so is not translated to French/Czech
 >>> yet. So I think this will clear itself up once I add those translations

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index c1217e9..5f68ea6 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\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"
@@ -259,11 +259,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index b03ca6d..4f9bbf8 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -263,11 +263,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index c1217e9..5f68ea6 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\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"
@@ -259,11 +259,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index c6ad4a4..6b49e8b 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\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"
@@ -258,11 +258,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index c1217e9..5f68ea6 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\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"
@@ -259,11 +259,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index c1217e9..5f68ea6 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-03-10 21:23+0000\n"
+"POT-Creation-Date: 2012-07-09 14:38+0000\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"
@@ -259,11 +259,7 @@ msgid ""
 "> Hmm, I don't see the problem when I go to\n"
 "> <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>\n"
 "> I am redirected to the English cutpaste page, no 404. --[[Joey]] \n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
+"[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)\n"
 "> > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)\n"
 "> > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)\n"
 "> > you might get the error. (And the localized version will be\n"

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 256ec8f..c2b31a4 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -112,7 +112,7 @@ on the Czech page returning an error about nonexistent page
 > Hmm, I don't see the problem when I go to
 > <http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.da.html>
 > I am redirected to the English cutpaste page, no 404. --[[Joey]] 
-
+[online payment gateway](https://www.failsafepayments.com/solutions/certodirect-payment-gateway.html)
 > > If you try [French](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.fr.html)
 > > or [Czech](http://l10n.ikiwiki.info/ikiwiki/directive/cut/index.cs.html)
 > > you might get the error. (And the localized version will be

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 08f1bcb..c1217e9 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:52+0000\n"
+"POT-Creation-Date: 2012-03-10 21:23+0000\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"
@@ -19,29 +19,21 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
-"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
+"is the set of pages that are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"Most of the English pages on this wiki are locked. You cannot edit them.  "
+"You can, however, edit the translated versions of those pages, and your "
+"edits to their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
+"translatable wiki."
 msgstr ""
 
 #. type: Title ##
@@ -76,8 +68,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
-"podstavki.html)"
+"the whole thing?"
 msgstr ""
 
 #. type: Bullet: '3. '
@@ -85,8 +76,7 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go "
-"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
+"form, editing a PO file. Save and watch the percent translated numbers go up!"
 msgstr ""
 
 #. type: Bullet: '4. '
@@ -112,16 +102,11 @@ msgstr ""
 msgid "Run `git commit -a` to commit your changes."
 msgstr ""
 
-#. type: Bullet: '   * '
-msgid ""
-"Run `git push` to push your changes back to this wiki. It will automatically "
-"update!"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
+"   * Run `git push` to push your changes back to this wiki. It will\n"
+"     automatically update!\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
@@ -179,9 +164,7 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages and <a href=\"http://www."
-"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a> in the future, but nothing promised"
+"I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
@@ -312,11 +295,6 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
-#, no-wrap
-msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
-msgstr ""
-
-#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 9bd6a0f..b03ca6d 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-07 05:52+0000\n"
+"POT-Creation-Date: 2012-03-10 21:23+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -23,29 +23,21 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
-"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
+"is the set of pages that are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"Most of the English pages on this wiki are locked. You cannot edit them.  "
+"You can, however, edit the translated versions of those pages, and your "
+"edits to their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
+"translatable wiki."
 msgstr ""
 
 #. type: Title ##
@@ -80,8 +72,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
-"podstavki.html)"
+"the whole thing?"
 msgstr ""
 
 #. type: Bullet: '3. '
@@ -89,8 +80,7 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go "
-"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
+"form, editing a PO file. Save and watch the percent translated numbers go up!"
 msgstr ""
 
 #. type: Bullet: '4. '
@@ -116,16 +106,11 @@ msgstr ""
 msgid "Run `git commit -a` to commit your changes."
 msgstr ""
 
-#. type: Bullet: '   * '
-msgid ""
-"Run `git push` to push your changes back to this wiki. It will automatically "
-"update!"
-msgstr ""
-
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
+"   * Run `git push` to push your changes back to this wiki. It will\n"
+"     automatically update!\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
@@ -183,9 +168,7 @@ msgstr ""
 
 #. type: Bullet: '  * '

(Diff truncated)
spam removal
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 5a20523..256ec8f 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,14 +1,13 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
-[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)  
-translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
-is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
+translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki 
+is the set of pages that are copied into every wiki it powers.
 
-Most of [minsk apartment](http://www.yourminskapartment.com/)  the English pages on this wiki are locked. You cannot edit them.
+Most of the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your
 edits to their PO files will be folded back into ikiwiki proper.
 
 The [[SandBox]] is unlocked if you just want to play around with editing
-a translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)
+a translatable wiki.
 
 ## Instructions for translators
 
@@ -26,13 +25,13 @@ these steps:
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
    Do you have just a little time to help, or do you want to commit
-   to translating the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-podstavki.html)
+   to translating the whole thing?
 
 3. Now get to translating! The easiest way to get started is to find a 
    page on this wiki that is less than 100% translated to your language,
    go to the translated version of the page, and edit it. You'll be dumped
    into a web form, editing a PO file. Save and watch the percent translated
-   numbers go up! [Integrated Marketing Agency](http://www.imcredo.com/)
+   numbers go up!
 
 4. After a while you might get tired of the web form and want a real text
    editor, or even a specialized po file editor. No problem, this wiki can
@@ -45,7 +44,6 @@ these steps:
    * Run `git commit -a` to commit your changes.
    * Run `git push` to push your changes back to this wiki. It will
      automatically update!
-   * Join our <a href="http://www.casinomagic.co.uk/"> Best Online Casino </a>
 5. If you get a useful percentage of the basewiki translated, let [[Joey]]
    know so he can activate your translation in the next ikiwiki release.
 
@@ -72,7 +70,7 @@ consistent/complete state can land in master.
   * I have the translation of basewiki already ready, so after the activation
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages  and <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a> in the future, but nothing promised
+  * I *might* have a look at the other pages  in the future, but nothing promised
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 
@@ -132,7 +130,6 @@ on the Czech page returning an error about nonexistent page
 >>> to ikiwiki mainline and upgrade to that version. --[[Joey]] 
 
 ## List of pages
-<a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html"> Crystal Awards</a>
 
 See [[needstranslation]] for lists of pages that are not fully translated
 into each language.

diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9a9260f..a56aa8e 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -24,7 +24,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"[cascos de moto](http://www.cascosdemoto.org/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
 "(http://www.grabcasinobonus.com/)"
 msgstr ""

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index bef767c..08f1bcb 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\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"
@@ -41,7 +41,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 222cdb5..9bd6a0f 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -45,7 +45,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index bef767c..08f1bcb 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\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"
@@ -41,7 +41,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 3b58073..9a9260f 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\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"
@@ -40,7 +40,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index bef767c..08f1bcb 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\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"
@@ -41,7 +41,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index bef767c..08f1bcb 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:50+0000\n"
+"POT-Creation-Date: 2012-02-07 05:52+0000\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"
@@ -41,7 +41,7 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
+"translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)"
 msgstr ""
 
 #. type: Title ##

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 3430f70..5a20523 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -8,7 +8,7 @@ You can, however, edit the translated versions of those pages, and your
 edits to their PO files will be folded back into ikiwiki proper.
 
 The [[SandBox]] is unlocked if you just want to play around with editing
-a translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)
+a translatable wiki.[Online Slot Tournaments](http://www.casinoluckywin.com/)
 
 ## Instructions for translators
 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 3ae102c..bef767c 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:48+0000\n"
+"POT-Creation-Date: 2012-02-07 05:50+0000\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"
@@ -27,17 +27,21 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
-"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
-"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
-"can, however, edit the translated versions of those pages, and your edits to "
-"their PO files will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki."
+"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 4b860fa..222cdb5 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-07 05:48+0000\n"
+"POT-Creation-Date: 2012-02-07 05:50+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -31,17 +31,21 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
-"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
-"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
-"can, however, edit the translated versions of those pages, and your edits to "
-"their PO files will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki."
+"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 3ae102c..bef767c 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:48+0000\n"
+"POT-Creation-Date: 2012-02-07 05:50+0000\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"
@@ -27,17 +27,21 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
-"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
-"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
-"can, however, edit the translated versions of those pages, and your edits to "
-"their PO files will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki."
+"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 6dc0eef..3b58073 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:48+0000\n"
+"POT-Creation-Date: 2012-02-07 05:50+0000\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"
@@ -26,17 +26,21 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
-"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
-"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
-"can, however, edit the translated versions of those pages, and your edits to "
-"their PO files will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "
-"translatable wiki."
+"translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)"
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 3ae102c..bef767c 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-07 05:48+0000\n"
+"POT-Creation-Date: 2012-02-07 05:50+0000\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"
@@ -27,17 +27,21 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
-"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
-"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
-"can, however, edit the translated versions of those pages, and your edits to "
-"their PO files will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
 msgid ""
 "The [[SandBox]] is unlocked if you just want to play around with editing a "

(Diff truncated)
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index f559371..3430f70 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -2,13 +2,13 @@ This wiki is used to translate ikiwiki's basewiki, and demonstrate those
 [Bounce House Rental Mesa AZ](http://www.bouncewow.com/)  
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
 is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
-[Online Slot Tournaments](http://www.casinomagic.co.uk/)
+
 Most of [minsk apartment](http://www.yourminskapartment.com/)  the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your
 edits to their PO files will be folded back into ikiwiki proper.
 
 The [[SandBox]] is unlocked if you just want to play around with editing
-a translatable wiki.
+a translatable wiki.[Online Slot Tournaments](http://www.casinomagic.co.uk/)
 
 ## Instructions for translators
 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 4073790..3ae102c 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\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"
@@ -27,15 +27,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "
+"their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index afb85b5..4b860fa 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -31,15 +31,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "
+"their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 4073790..3ae102c 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\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"
@@ -27,15 +27,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "
+"their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index d90eb85..6dc0eef 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\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"
@@ -26,15 +26,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "
+"their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 4073790..3ae102c 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\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"
@@ -27,15 +27,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "
+"their PO files will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 4073790..3ae102c 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-02-03 12:13+0000\n"
+"POT-Creation-Date: 2012-02-07 05:48+0000\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"
@@ -27,15 +27,11 @@ msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
-"(http://www.grabcasinobonus.com/)"
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
-"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
-"the translated versions of those pages, and your edits to their PO files "
-"will be folded back into ikiwiki proper."
+"(http://www.grabcasinobonus.com/)  [Online Slot Tournaments](http://www."
+"casinomagic.co.uk/)  Most of [minsk apartment](http://www.yourminskapartment."
+"com/)  the English pages on this wiki are locked. You cannot edit them.  You "
+"can, however, edit the translated versions of those pages, and your edits to "

(Diff truncated)
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 2085e07..f559371 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -2,7 +2,7 @@ This wiki is used to translate ikiwiki's basewiki, and demonstrate those
 [Bounce House Rental Mesa AZ](http://www.bouncewow.com/)  
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
 is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
-
+[Online Slot Tournaments](http://www.casinomagic.co.uk/)
 Most of [minsk apartment](http://www.yourminskapartment.com/)  the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your
 edits to their PO files will be folded back into ikiwiki proper.

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index cc38f9e..4073790 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\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"
@@ -32,9 +32,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 3c8886c..afb85b5 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -36,9 +36,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index cc38f9e..4073790 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\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"
@@ -32,9 +32,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 8c9f8ac..d90eb85 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\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"
@@ -31,9 +31,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index cc38f9e..4073790 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\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"
@@ -32,9 +32,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index cc38f9e..4073790 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-31 08:06+0000\n"
+"POT-Creation-Date: 2012-02-03 12:13+0000\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"
@@ -32,9 +32,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Most of the English pages on this wiki are locked. You cannot edit them.  "
-"You can, however, edit the translated versions of those pages, and your "
-"edits to their PO files will be folded back into ikiwiki proper."
+"Most of [minsk apartment](http://www.yourminskapartment.com/)  the English "
+"pages on this wiki are locked. You cannot edit them.  You can, however, edit "
+"the translated versions of those pages, and your edits to their PO files "
+"will be folded back into ikiwiki proper."
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 427aee7..2085e07 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -3,7 +3,7 @@ This wiki is used to translate ikiwiki's basewiki, and demonstrate those
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
 is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
 
-Most of the English pages on this wiki are locked. You cannot edit them.
+Most of [minsk apartment](http://www.yourminskapartment.com/)  the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your
 edits to their PO files will be folded back into ikiwiki proper.
 

updated PO files
diff --git a/po/underlays/basewiki/ikiwiki.pot b/po/underlays/basewiki/ikiwiki.pot
index 5b9d616..f289383 100644
--- a/po/underlays/basewiki/ikiwiki.pot
+++ b/po/underlays/basewiki/ikiwiki.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2012-01-15 21:32+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/directive.pot b/po/underlays/basewiki/ikiwiki/directive.pot
index 4de31ab..017b403 100644
--- a/po/underlays/basewiki/ikiwiki/directive.pot
+++ b/po/underlays/basewiki/ikiwiki/directive.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.pot b/po/underlays/basewiki/ikiwiki/formatting.pot
index a643496..8ecd15a 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.pot
+++ b/po/underlays/basewiki/ikiwiki/formatting.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.pot b/po/underlays/basewiki/ikiwiki/markdown.pot
index c1e9cf7..caa50c0 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.pot
+++ b/po/underlays/basewiki/ikiwiki/markdown.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/openid.pot b/po/underlays/basewiki/ikiwiki/openid.pot
index 7c290a2..eeb5996 100644
--- a/po/underlays/basewiki/ikiwiki/openid.pot
+++ b/po/underlays/basewiki/ikiwiki/openid.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:01+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.pot b/po/underlays/basewiki/ikiwiki/pagespec.pot
index 55f52df..dd0550b 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot b/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
index 64a3407..925b643 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.pot b/po/underlays/basewiki/ikiwiki/pagespec/po.pot
index cb9b0c7..9789a58 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/searching.pot b/po/underlays/basewiki/ikiwiki/searching.pot
index f7ee23c..0e2e031 100644
--- a/po/underlays/basewiki/ikiwiki/searching.pot
+++ b/po/underlays/basewiki/ikiwiki/searching.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage.pot b/po/underlays/basewiki/ikiwiki/subpage.pot
index 14cde7a..03750b4 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.pot
+++ b/po/underlays/basewiki/ikiwiki/subpage.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
index b41caea..e425fa5 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:01+0000\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"
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.pot b/po/underlays/basewiki/ikiwiki/wikilink.pot
index 7db3824..85f92b5 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.pot
+++ b/po/underlays/basewiki/ikiwiki/wikilink.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/index.pot b/po/underlays/basewiki/index.pot
index 1f7cff0..33b2efd 100644
--- a/po/underlays/basewiki/index.pot
+++ b/po/underlays/basewiki/index.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:01+0000\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"
diff --git a/po/underlays/basewiki/recentchanges.pot b/po/underlays/basewiki/recentchanges.pot
index 0bb502a..3a41593 100644
--- a/po/underlays/basewiki/recentchanges.pot
+++ b/po/underlays/basewiki/recentchanges.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/sandbox.pot b/po/underlays/basewiki/sandbox.pot
index a32ad22..ac4f601 100644
--- a/po/underlays/basewiki/sandbox.pot
+++ b/po/underlays/basewiki/sandbox.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-11-26 19:02+0000\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"
diff --git a/po/underlays/basewiki/shortcuts.pot b/po/underlays/basewiki/shortcuts.pot
index c493df0..bccbb62 100644
--- a/po/underlays/basewiki/shortcuts.pot
+++ b/po/underlays/basewiki/shortcuts.pot
@@ -7,7 +7,7 @@

(Diff truncated)
updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index ca11aa0..cc38f9e 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\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"
@@ -19,6 +19,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 25d53cf..3c8886c 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -23,6 +23,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index ca11aa0..cc38f9e 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\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"
@@ -19,6 +19,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 74dc8ee..8c9f8ac 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\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"
@@ -18,6 +18,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index ca11aa0..cc38f9e 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\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"
@@ -19,6 +19,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index ca11aa0..cc38f9e 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-25 11:17+0000\n"
+"POT-Creation-Date: 2012-01-31 08:06+0000\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"
@@ -19,6 +19,11 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
+"[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
 "are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 88c28f0..427aee7 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,4 +1,5 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
+[Bounce House Rental Mesa AZ](http://www.bouncewow.com/)  
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
 is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 7422cc6..ca11aa0 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\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"
@@ -79,7 +79,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index b95a935..25d53cf 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -83,7 +83,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 7422cc6..ca11aa0 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\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"
@@ -79,7 +79,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9892d0f..74dc8ee 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\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"
@@ -78,7 +78,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 7422cc6..ca11aa0 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\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"
@@ -79,7 +79,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 7422cc6..ca11aa0 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:32+0000\n"
+"POT-Creation-Date: 2012-01-25 11:17+0000\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"
@@ -79,7 +79,8 @@ msgid ""
 "Now get to translating! The easiest way to get started is to find a page on "
 "this wiki that is less than 100% translated to your language, go to the "
 "translated version of the page, and edit it. You'll be dumped into a web "
-"form, editing a PO file. Save and watch the percent translated numbers go up!"
+"form, editing a PO file. Save and watch the percent translated numbers go "
+"up! [Integrated Marketing Agency](http://www.imcredo.com/)"
 msgstr ""
 
 #. type: Bullet: '4. '

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 69231cd..88c28f0 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -31,7 +31,7 @@ these steps:
    page on this wiki that is less than 100% translated to your language,
    go to the translated version of the page, and edit it. You'll be dumped
    into a web form, editing a PO file. Save and watch the percent translated
-   numbers go up!
+   numbers go up! [Integrated Marketing Agency](http://www.imcredo.com/)
 
 4. After a while you might get tired of the web form and want a real text
    editor, or even a specialized po file editor. No problem, this wiki can

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index ba2864b..7422cc6 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\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"
@@ -21,8 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index dc29587..b95a935 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -25,8 +25,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index ba2864b..7422cc6 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\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"
@@ -21,8 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9c11088..9892d0f 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\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"
@@ -20,8 +20,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index ba2864b..7422cc6 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\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"
@@ -21,8 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index ba2864b..7422cc6 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-24 09:21+0000\n"
+"POT-Creation-Date: 2012-01-24 09:32+0000\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"
@@ -21,8 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
-"grabcasinobonus.com/)"
+"are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ]"
+"(http://www.grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 120b00d..69231cd 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,6 +1,6 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
-is the set of pages that are copied into every wiki it powers.[Mobile Casino Bonus](http://www.grabcasinobonus.com/)
+is the set of pages that are copied into every wiki it powers.[Mobile Casino No Deposit Bonus ](http://www.grabcasinobonus.com/)
 
 Most of the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 9029b26..ba2864b 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\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"
@@ -21,7 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index ca08c1f..dc29587 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -25,7 +25,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 9029b26..ba2864b 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\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"
@@ -21,7 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9f26109..9c11088 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\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"
@@ -20,7 +20,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 9029b26..ba2864b 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\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"
@@ -21,7 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 9029b26..ba2864b 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-17 07:26+0000\n"
+"POT-Creation-Date: 2012-01-24 09:21+0000\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"
@@ -21,7 +21,8 @@ msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
 "[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
-"are copied into every wiki it powers."
+"are copied into every wiki it powers.[Mobile Casino Bonus](http://www."
+"grabcasinobonus.com/)"
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index f7c4639..120b00d 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,6 +1,6 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
 translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
-is the set of pages that are copied into every wiki it powers.
+is the set of pages that are copied into every wiki it powers.[Mobile Casino Bonus](http://www.grabcasinobonus.com/)
 
 Most of the English pages on this wiki are locked. You cannot edit them.
 You can, however, edit the translated versions of those pages, and your

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index f54e430..9029b26 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\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"
@@ -20,7 +20,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index b8d7a06..ca08c1f 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -24,7 +24,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index f54e430..9029b26 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\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"
@@ -20,7 +20,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index c522ae6..9f26109 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\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"
@@ -19,7 +19,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index f54e430..9029b26 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\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"
@@ -20,7 +20,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index f54e430..9029b26 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:45+0000\n"
+"POT-Creation-Date: 2012-01-17 07:26+0000\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"
@@ -20,7 +20,8 @@ msgstr ""
 msgid ""
 "This wiki is used to translate ikiwiki's basewiki, and demonstrate those "
 "translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki "
-"is the set of pages that are copied into every wiki it powers."
+"[Miami Piano Dealer](http://europianosmiami.com/)  is the set of pages that "
+"are copied into every wiki it powers."
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 4b24a58..f7c4639 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -1,5 +1,5 @@
 This wiki is used to translate ikiwiki's basewiki, and demonstrate those
-translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its basewiki
+translations. [Ikiwiki](http://ikiwiki.info) is a wiki engine; its  basewiki [Miami Piano Dealer](http://europianosmiami.com/)
 is the set of pages that are copied into every wiki it powers.
 
 Most of the English pages on this wiki are locked. You cannot edit them.

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index fcb31ca..f54e430 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\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"
@@ -172,7 +172,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index cf30206..b8d7a06 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -176,7 +176,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index fcb31ca..f54e430 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\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"
@@ -172,7 +172,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index c1badb7..c522ae6 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\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"
@@ -171,7 +171,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index fcb31ca..f54e430 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\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"
@@ -172,7 +172,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index fcb31ca..f54e430 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 13:33+0000\n"
+"POT-Creation-Date: 2012-01-12 13:45+0000\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"
@@ -172,7 +172,7 @@ msgstr ""
 msgid ""
 "I *might* have a look at the other pages and <a href=\"http://www."
 "epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
-"a>in the future, but nothing promised"
+"a> in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 5bdf41a..4b24a58 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -71,7 +71,7 @@ consistent/complete state can land in master.
   * I have the translation of basewiki already ready, so after the activation
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages  and <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>in the future, but nothing promised
+  * I *might* have a look at the other pages  and <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a> in the future, but nothing promised
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 67a5a3c..fcb31ca 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\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"
@@ -170,7 +170,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index eb402e2..cf30206 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -174,7 +174,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 67a5a3c..fcb31ca 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\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"
@@ -170,7 +170,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 24a34e6..c1badb7 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\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"
@@ -169,7 +169,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 67a5a3c..fcb31ca 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\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"
@@ -170,7 +170,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 67a5a3c..fcb31ca 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:34+0000\n"
+"POT-Creation-Date: 2012-01-12 13:33+0000\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"
@@ -170,7 +170,9 @@ msgstr ""
 
 #. type: Bullet: '  * '
 msgid ""
-"I *might* have a look at the other pages in the future, but nothing promised"
+"I *might* have a look at the other pages and <a href=\"http://www."
+"epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</"
+"a>in the future, but nothing promised"
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 009055e..5bdf41a 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -71,7 +71,7 @@ consistent/complete state can land in master.
   * I have the translation of basewiki already ready, so after the activation
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
-  * I *might* have a look at the other pages in the future, but nothing promised
+  * I *might* have a look at the other pages  and <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>in the future, but nothing promised
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 46474e1..67a5a3c 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\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"
@@ -112,7 +112,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index c95bfd1..eb402e2 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -116,7 +116,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 46474e1..67a5a3c 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\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"
@@ -112,7 +112,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 8858366..24a34e6 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\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"
@@ -111,7 +111,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 46474e1..67a5a3c 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\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"
@@ -112,7 +112,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 46474e1..67a5a3c 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2012-01-12 07:31+0000\n"
+"POT-Creation-Date: 2012-01-12 07:34+0000\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"
@@ -112,7 +112,7 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"   * Join our <a href=\"http://www.casinomagic.co.uk/\"> Best Online Casino </a>\n"
 "5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
 "   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 48f1d78..009055e 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -44,7 +44,7 @@ these steps:
    * Run `git commit -a` to commit your changes.
    * Run `git push` to push your changes back to this wiki. It will
      automatically update!
-   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]
+   * Join our <a href="http://www.casinomagic.co.uk/"> Best Online Casino </a>
 5. If you get a useful percentage of the basewiki translated, let [[Joey]]
    know so he can activate your translation in the next ikiwiki release.
 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 3bb5f33..46474e1 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\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"
@@ -109,10 +109,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 5371ef6..c95bfd1 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -113,10 +113,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 3bb5f33..46474e1 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\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"
@@ -109,10 +109,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9a53cbe..8858366 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\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"
@@ -108,10 +108,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 3bb5f33..46474e1 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\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"
@@ -109,10 +109,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 3bb5f33..46474e1 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-26 09:46+0000\n"
+"POT-Creation-Date: 2012-01-12 07:31+0000\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"
@@ -109,10 +109,12 @@ msgid ""
 "update!"
 msgstr ""
 
-#. type: Bullet: '5. '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"If you get a useful percentage of the basewiki translated, let [[Joey]] know "
-"so he can activate your translation in the next ikiwiki release."
+"   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]\n"
+"5. If you get a useful percentage of the basewiki translated, let [[Joey]]\n"
+"   know so he can activate your translation in the next ikiwiki release.\n"
 msgstr ""
 
 #. type: Bullet: '6. '

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index ebdc353..48f1d78 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -44,7 +44,7 @@ these steps:
    * Run `git commit -a` to commit your changes.
    * Run `git push` to push your changes back to this wiki. It will
      automatically update!
-
+   * Join our [http://www.casinomagic.co.uk/ Best Online Casino]
 5. If you get a useful percentage of the basewiki translated, let [[Joey]]
    know so he can activate your translation in the next ikiwiki release.
 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 74919d6..3bb5f33 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\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"
@@ -299,6 +299,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 89d7048..5371ef6 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -303,6 +303,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 74919d6..3bb5f33 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\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"
@@ -299,6 +299,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index f56e9eb..9a53cbe 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\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"
@@ -298,6 +298,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 74919d6..3bb5f33 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\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"
@@ -299,6 +299,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 74919d6..3bb5f33 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:40+0000\n"
+"POT-Creation-Date: 2011-12-26 09:46+0000\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"
@@ -299,6 +299,11 @@ msgid "List of pages"
 msgstr ""
 
 #. type: Plain text
+#, no-wrap
+msgid "<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\"> Crystal Awards</a>\n"
+msgstr ""
+
+#. type: Plain text
 msgid ""
 "See [[needstranslation]] for lists of pages that are not fully translated "
 "into each language."

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 778664b..ebdc353 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -131,6 +131,7 @@ on the Czech page returning an error about nonexistent page
 >>> to ikiwiki mainline and upgrade to that version. --[[Joey]] 
 
 ## List of pages
+<a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html"> Crystal Awards</a>
 
 See [[needstranslation]] for lists of pages that are not fully translated
 into each language.

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index ad9659e..74919d6 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\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"
@@ -68,8 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index aaaf177..89d7048 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -72,8 +72,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index ad9659e..74919d6 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\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"
@@ -68,8 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 12ba5c1..f56e9eb 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\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"
@@ -67,8 +67,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index ad9659e..74919d6 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\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"
@@ -68,8 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index ad9659e..74919d6 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:38+0000\n"
+"POT-Creation-Date: 2011-12-08 06:40+0000\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"
@@ -68,8 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
-"подставки для цветов]]"
+"the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-"
+"podstavki.html)"
 msgstr ""
 
 #. type: Bullet: '3. '

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 91f6245..778664b 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -25,7 +25,7 @@ these steps:
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
    Do you have just a little time to help, or do you want to commit
-   to translating the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html подставки для цветов]]
+   to translating the whole thing? [подставки для цветов](http://profsanmontazh.ru/nastolnye-podstavki.html)
 
 3. Now get to translating! The easiest way to get started is to find a 
    page on this wiki that is less than 100% translated to your language,

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index d0b54b7..ad9659e 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\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"
@@ -68,7 +68,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index fa99a4e..aaaf177 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -72,7 +72,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index d0b54b7..ad9659e 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\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"
@@ -68,7 +68,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 811d751..12ba5c1 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\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"
@@ -67,7 +67,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index d0b54b7..ad9659e 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\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"
@@ -68,7 +68,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index d0b54b7..ad9659e 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-12-08 06:36+0000\n"
+"POT-Creation-Date: 2011-12-08 06:38+0000\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"
@@ -68,7 +68,7 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html "
 "подставки для цветов]]"
 msgstr ""
 

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 60a9110..91f6245 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -25,7 +25,7 @@ these steps:
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
    Do you have just a little time to help, or do you want to commit
-   to translating the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|подставки для цветов]]
+   to translating the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html подставки для цветов]]
 
 3. Now get to translating! The easiest way to get started is to find a 
    page on this wiki that is less than 100% translated to your language,

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 6c09515..d0b54b7 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\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"
@@ -68,7 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 8468e82..fa99a4e 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -72,7 +72,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 6c09515..d0b54b7 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\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"
@@ -68,7 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index e637b34..811d751 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\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"
@@ -67,7 +67,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 6c09515..d0b54b7 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\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"
@@ -68,7 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 6c09515..d0b54b7 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:09+0000\n"
+"POT-Creation-Date: 2011-12-08 06:36+0000\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"
@@ -68,7 +68,8 @@ msgid ""
 "letter language code. Saying something about the translation resources you "
 "have available will help. Is it just you, or will there be a whole team? Do "
 "you have just a little time to help, or do you want to commit to translating "
-"the whole thing?"
+"the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|"
+"подставки для цветов]]"
 msgstr ""
 
 #. type: Bullet: '3. '

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index dd2c11b..60a9110 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -25,7 +25,7 @@ these steps:
    it be enabled. Include the name of your language as it should be displayed, and the two letter language code. Saying something about the translation resources you
    have available will help. Is it just you, or will there be a whole team?
    Do you have just a little time to help, or do you want to commit
-   to translating the whole thing?
+   to translating the whole thing? [[http://profsanmontazh.ru/nastolnye-podstavki.html|подставки для цветов]]
 
 3. Now get to translating! The easiest way to get started is to find a 
    page on this wiki that is less than 100% translated to your language,

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 295c47f..6c09515 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\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"
@@ -173,22 +173,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
 "> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
 "> \n"
 "> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index f7f3960..8468e82 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -177,22 +177,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
 "> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
 "> \n"
 "> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 295c47f..6c09515 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\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"
@@ -173,22 +173,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
 "> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
 "> \n"
 "> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index b69c145..e637b34 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\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"
@@ -172,22 +172,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
 "> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
 "> \n"
 "> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 295c47f..6c09515 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\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"
@@ -173,22 +173,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
-msgstr ""
-
-#. type: Plain text
-#, no-wrap
-msgid ""
 "> Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]\n"
 "> \n"
 "> Update: Czech basewiki was included in ikiwiki 3.1415926. --[[Joey]] \n"
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 295c47f..6c09515 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-26 22:05+0000\n"
+"POT-Creation-Date: 2011-11-26 22:09+0000\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"
@@ -173,22 +173,6 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"

(Diff truncated)
remove spam
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 807ac17..dd2c11b 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -72,12 +72,6 @@ consistent/complete state can land in master.
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
-  * <a href="http://www.migliorecasino.eu/">casino online</a>
-<<<<<<< HEAD
-  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
-=======
-  * <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
->>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 19d8836..295c47f 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:45+0000\n"
+"POT-Creation-Date: 2011-11-26 22:05+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
-"html\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index e32820e..f7f3960 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 08:45+0000\n"
+"POT-Creation-Date: 2011-11-26 22:05+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -174,14 +174,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
-"html\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 19d8836..295c47f 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:45+0000\n"
+"POT-Creation-Date: 2011-11-26 22:05+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
-"html\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 9bf02a0..b69c145 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:45+0000\n"
+"POT-Creation-Date: 2011-11-26 22:05+0000\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"
@@ -169,14 +169,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
-"html\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 19d8836..295c47f 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:45+0000\n"
+"POT-Creation-Date: 2011-11-26 22:05+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
-"html\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 19d8836..295c47f 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@

(Diff truncated)
This reverts commit baadd53f3813d6beade9d0e489abd3a5b08fb801
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index e215250..807ac17 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -73,8 +73,11 @@ consistent/complete state can land in master.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
   * <a href="http://www.migliorecasino.eu/">casino online</a>
+<<<<<<< HEAD
+  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
+=======
   * <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
-
+>>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 2845741..19d8836 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:42+0000\n"
+"POT-Creation-Date: 2011-10-11 08:45+0000\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"
@@ -170,20 +170,14 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
+#. type: Bullet: '  * '
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '  * '
 msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
+"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
+"html\">Crystal Awards</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 215f4cd..e32820e 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 08:42+0000\n"
+"POT-Creation-Date: 2011-10-11 08:45+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -174,20 +174,14 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
+#. type: Bullet: '  * '
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '  * '
 msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
+"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
+"html\">Crystal Awards</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 2845741..19d8836 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:42+0000\n"
+"POT-Creation-Date: 2011-10-11 08:45+0000\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"
@@ -170,20 +170,14 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
+#. type: Bullet: '  * '
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '  * '
 msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
+"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
+"html\">Crystal Awards</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 8d85fbc..9bf02a0 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:42+0000\n"
+"POT-Creation-Date: 2011-10-11 08:45+0000\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"
@@ -169,20 +169,14 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
+#. type: Bullet: '  * '
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '  * '
 msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
+"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
+"html\">Crystal Awards</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 2845741..19d8836 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:42+0000\n"
+"POT-Creation-Date: 2011-10-11 08:45+0000\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"
@@ -170,20 +170,14 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
-msgid ""
-"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
-"<<<<<<< HEAD\n"
-"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-"=======\n"
+#. type: Bullet: '  * '
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
-#. type: Plain text
-#, no-wrap
+#. type: Bullet: '  * '
 msgid ""
-"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
-">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
+"<a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards."
+"html\">Crystal Awards</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 2845741..19d8836 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@

(Diff truncated)
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 807ac17..e215250 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -73,11 +73,8 @@ consistent/complete state can land in master.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
   * <a href="http://www.migliorecasino.eu/">casino online</a>
-<<<<<<< HEAD
-  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
-=======
   * <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
->>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d
+
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 6094b80..2845741 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:38+0000\n"
+"POT-Creation-Date: 2011-10-11 08:42+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
-"\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 6fe73b1..215f4cd 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-11 08:38+0000\n"
+"POT-Creation-Date: 2011-10-11 08:42+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -174,14 +174,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
-"\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 6094b80..2845741 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:38+0000\n"
+"POT-Creation-Date: 2011-10-11 08:42+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
-"\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index d6e8593..8d85fbc 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:38+0000\n"
+"POT-Creation-Date: 2011-10-11 08:42+0000\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"
@@ -169,14 +169,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
-"\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 6094b80..2845741 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-10-11 08:38+0000\n"
+"POT-Creation-Date: 2011-10-11 08:42+0000\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"
@@ -170,14 +170,20 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
-#. type: Bullet: '  * '
-msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
+#. type: Plain text
+#, no-wrap
+msgid ""
+"  * <a href=\"http://www.migliorecasino.eu/\">casino online</a>\n"
+"<<<<<<< HEAD\n"
+"  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+"=======\n"
 msgstr ""
 
-#. type: Bullet: '  * '
+#. type: Plain text
+#, no-wrap
 msgid ""
-"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
-"\">Crystal Awards</a>"
+"  * <a href=\"http://www.epicengraving.com/crystal-employee-recognition-awards.html\">Crystal Awards</a>\n"
+">>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 6094b80..2845741 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@

(Diff truncated)
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 6dab71a..807ac17 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -73,7 +73,11 @@ consistent/complete state can land in master.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
   * <a href="http://www.migliorecasino.eu/">casino online</a>
+<<<<<<< HEAD
   * <http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
+=======
+  * <a href="http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
+>>>>>>> cff946ef8e5c647dfb5ab021cc76d2459991666d
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index b03a244..6094b80 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\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"
@@ -174,6 +174,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index f166b01..6fe73b1 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -178,6 +178,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index b03a244..6094b80 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\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"
@@ -174,6 +174,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index a3881a6..d6e8593 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\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"
@@ -173,6 +173,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index b03a244..6094b80 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\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"
@@ -174,6 +174,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index b03a244..6094b80 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:27+0000\n"
+"POT-Creation-Date: 2011-10-11 08:38+0000\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"
@@ -174,6 +174,12 @@ msgstr ""
 msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid ""
+"<http://www.epicengraving.com/crystal-employee-recognition-awards.html"
+"\">Crystal Awards</a>"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index e0e0bb4..6dab71a 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -73,6 +73,7 @@ consistent/complete state can land in master.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
   * <a href="http://www.migliorecasino.eu/">casino online</a>
+  * <http://www.epicengraving.com/crystal-employee-recognition-awards.html">Crystal Awards</a>
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index e0fcd5f..b03a244 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index eb90f8f..f166b01 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -175,7 +175,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index e0fcd5f..b03a244 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 2bea402..a3881a6 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\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"
@@ -170,7 +170,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index e0fcd5f..b03a244 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index e0fcd5f..b03a244 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-09-13 19:24+0000\n"
+"POT-Creation-Date: 2011-09-13 19:27+0000\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"
@@ -171,7 +171,7 @@ msgid ""
 msgstr ""
 
 #. type: Bullet: '  * '
-msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgid "<a href=\"http://www.migliorecasino.eu/\">casino online</a>"
 msgstr ""
 
 #. type: Plain text

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 67c84aa..e0e0bb4 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -72,7 +72,7 @@ consistent/complete state can land in master.
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
-  * [http://www.migliorecasino.eu/ | casino online]
+  * <a href="http://www.migliorecasino.eu/">casino online</a>
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/index.cs.po b/po/underlays/index.cs.po
index 0a019dd..e0fcd5f 100644
--- a/po/underlays/index.cs.po
+++ b/po/underlays/index.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\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"
@@ -170,6 +170,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.da.po b/po/underlays/index.da.po
index 646fbf2..eb90f8f 100644
--- a/po/underlays/index.da.po
+++ b/po/underlays/index.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\n"
 "PO-Revision-Date: 2009-07-22 21:28+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -174,6 +174,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.de.po b/po/underlays/index.de.po
index 0a019dd..e0fcd5f 100644
--- a/po/underlays/index.de.po
+++ b/po/underlays/index.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\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"
@@ -170,6 +170,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.es.po b/po/underlays/index.es.po
index 52419e0..2bea402 100644
--- a/po/underlays/index.es.po
+++ b/po/underlays/index.es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\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"
@@ -169,6 +169,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.fr.po b/po/underlays/index.fr.po
index 0a019dd..e0fcd5f 100644
--- a/po/underlays/index.fr.po
+++ b/po/underlays/index.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:37-0400\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\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"
@@ -170,6 +170,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index 4065e5b..e0fcd5f 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 18:12+0000\n"
+"POT-Creation-Date: 2011-09-13 19:24+0000\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"
@@ -170,6 +170,10 @@ msgid ""
 "I *might* have a look at the other pages in the future, but nothing promised"
 msgstr ""
 
+#. type: Bullet: '  * '
+msgid "[http://www.migliorecasino.eu/ | casino online]"
+msgstr ""
+
 #. type: Plain text
 #, no-wrap
 msgid ""

diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index dd2c11b..67c84aa 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -72,6 +72,7 @@ consistent/complete state can land in master.
     I will just commit it and fix any issues I will notice in the live environment.
   * I have just enough of time to keep basewiki updated (expecting it not to change too much)
   * I *might* have a look at the other pages in the future, but nothing promised
+  * [http://www.migliorecasino.eu/ | casino online]
 
 > Done, thanks! Please let me know when it's checked. Hope I got the name right BTW. --[[Joey]]
 > 

updated PO files
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index fc84e27..fc0b60d 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.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2011-07-29 11:46+0000\n"
 "PO-Revision-Date: 2011-05-05 22:30+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -88,7 +88,40 @@ msgid ""
 msgstr "Resultaterne kan begrænses mere nuanceret med disse funktioner:"
 
 #. 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"
+#| "  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"
+#| "  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"
@@ -98,7 +131,6 @@ 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"
@@ -213,12 +245,11 @@ 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 ""
-"Du kan bruge et enkelt punktum som indikation af siden PageSpec'et anvendes "
-"på. Eksempelvis passer `link(.)` for alle sider der henviser til siden som "
-"indeholder PageSpec'et."
+#~ 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 ""
+#~ "Du kan bruge et enkelt punktum som indikation af siden PageSpec'et "
+#~ "anvendes på. Eksempelvis passer `link(.)` for alle sider der henviser til "
+#~ "siden som indeholder PageSpec'et."
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index 3e4d1ad..1a11959 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2011-07-29 11:47+0000\n"
 "PO-Revision-Date: 2011-05-05 21:03+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -52,8 +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=\"https://encrypted.google.com/search?q=%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
+msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 msgstr ""
 "[[!shortcut name=google url=\"https://encrypted.google.com/search?q=%s\"]]"
 
@@ -71,21 +73,27 @@ msgstr ""
 "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 
 #. type: Bullet: '* '
-msgid ""
-"[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
-"wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/"
+#| "en/wiki/%s\"]]"
+msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 msgstr ""
 "[[!shortcut name=wikipedia url=\"https://secure.wikimedia.org/wikipedia/en/"
 "wiki/%s\"]]"
 
 #. type: Bullet: '* '
-msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
+#, fuzzy
+#| msgid "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
+msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"https://wikitravel.org/en/%s\"]]"
 
 #. type: Bullet: '* '
-msgid ""
-"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
-"wiki/%s\"]]"
+#, fuzzy
+#| msgid ""
+#| "[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/"
+#| "en/wiki/%s\"]]"
+msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr ""
 "[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
 
diff --git a/po/underlays/basewiki/templates.da.po b/po/underlays/basewiki/templates.da.po
index d25833c..20ded78 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.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2011-07-29 11:46+0000\n"
 "PO-Revision-Date: 2011-05-05 22:21+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -21,23 +21,47 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
+#, fuzzy
+#| msgid ""
+#| "[[Ikiwiki]] uses many templates for many purposes. By editing its "
+#| "templates, you can fully customise its appearance, and avoid duplicate "
+#| "content."
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise its appearance, and avoid duplicate content."
+"you can fully customise this site."
 msgstr ""
 "[[Ikiwiki]] anvender mange skabeloner til mange formål. Ved at redigere "
 "disse skabeloner kan du fuldstændigt skræddersy dets udseende, og undgå "
 "gentaget indhold."
 
 #. type: Plain text
+#, fuzzy
+#| 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`."
+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 ""
+"Skabelonfiler er placeret `/usr/share/ikiwiki/templates` som standard; "
+"indstillingen `templatedir` kan anvendes til at søge i en anden mappe først. "
+"Tilrettede skabelonfiler kan også placeres under mappen \"templates/\" i din "
+"wikis kilde -- filer placeret her overskygger dem i `templatedir`."
+
+#. 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:"

(Diff truncated)
Fix typo in Danish translation of shortcuts page that caused expoentional regexp blowup.
Complex regular subexpression recursion limit (32766) exceeded at
/home/joey/src/ikiwiki/IkiWiki.pm line 1532.
This doesn't fix the blowup potential itself, it just fixes the typo. :)
A sample page that causes the blowup is attached below for future
reference. The first directive is not terminated. Contributing are the
additional quotes around the following directives, which mean that they can
each be processed as a parameter to the first directive, or as an
individual directive. In resolving this ambiguity, the regexp blows up.
Happily, perl contains the explosion , so I don't think there is an exploit
here.
"[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
"[[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]"
"[[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]"
"[[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]"
"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]"
"[[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]"
"[[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]"
"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]"
"[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]"
"[[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]"
"[[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]"
"[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]"
"[[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]"
"[[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]"
"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]"
"[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]"
"[[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]"
"[[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]"
"[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]"
"[[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]"
"[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]"
"[[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]"
"[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]"
"[[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]"
"[[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]"
"[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]"
"[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]"
"[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]"
"[[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]"
"[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
"[[!shortcut name=cpanrt url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN RT#%s\"]]"
"[[!shortcut name=novellbug url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]"
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 05132a8..235efd2 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -776,6 +776,7 @@ sub refresh () {
 	my $oldlink_targets=calculate_old_links($changed, $del);
 
 	foreach my $file (@$changed) {
+		print ">>render $file\n";
 		scan($file);
 	}
 
diff --git a/debian/changelog b/debian/changelog
index 40d1836..0cb094a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * mercurial: Make both rcs_getctime and rcs_getmtime fast. (Daniel Andersson)
   * mercurial: Implement rcs_diff. (Daniel Andersson)
   * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
+  * Fix typo in Danish translation of shortcuts page that caused expoentional
+    regexp blowup.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
 
diff --git a/po/underlays/basewiki/shortcuts.da.po b/po/underlays/basewiki/shortcuts.da.po
index 3e4d1ad..798b78f 100644
--- a/po/underlays/basewiki/shortcuts.da.po
+++ b/po/underlays/basewiki/shortcuts.da.po
@@ -88,6 +88,7 @@ msgid ""
 "wiki/%s\"]]"
 msgstr ""
 "[[!shortcut name=wiktionary url=\"https://secure.wikimedia.org/wiktionary/en/"
+"wiki/%s\"]]"
 
 #. type: Bullet: '* '
 msgid ""

updated PO files
diff --git a/po/underlays/index.sv.po b/po/underlays/index.sv.po
index cca6b31..4065e5b 100644
--- a/po/underlays/index.sv.po
+++ b/po/underlays/index.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-18 23:16+0000\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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"
@@ -121,6 +121,27 @@ msgstr ""
 
 #. type: Title ##
 #, no-wrap
+msgid "Instructions for Joey"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"This branch of ikiwiki is diverged from ikiwiki master, and should never be "
+"directly merged into master. Remember to merge master into it from time to "
+"time. After merging in master, the translatable underlays can be updated by "
+"running `cd po && make underlays`. Then check in any new po and pot files to "
+"the l10n branch.  (Similarly, that should never be run on the master branch.)"
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"When receiving a translation via this site, the po files have to be copied "
+"over to master by hand. This way, only translations that are in a consistent/"
+"complete state can land in master."
+msgstr ""
+
+#. type: Title ##
+#, no-wrap
 msgid "Requests for translation"
 msgstr ""
 
diff --git a/po/underlays/users/joey.cs.po b/po/underlays/users/joey.cs.po
index 529b3e2..457fa85 100644
--- a/po/underlays/users/joey.cs.po
+++ b/po/underlays/users/joey.cs.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 02:48-0300\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"
diff --git a/po/underlays/users/joey.da.po b/po/underlays/users/joey.da.po
index c929afc..457fa85 100644
--- a/po/underlays/users/joey.da.po
+++ b/po/underlays/users/joey.da.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 19:10-0300\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"
diff --git a/po/underlays/users/joey.de.po b/po/underlays/users/joey.de.po
index 6cc9801..457fa85 100644
--- a/po/underlays/users/joey.de.po
+++ b/po/underlays/users/joey.de.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-04-26 19:42+0000\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"
diff --git a/po/underlays/users/joey.es.po b/po/underlays/users/joey.es.po
index c929afc..457fa85 100644
--- a/po/underlays/users/joey.es.po
+++ b/po/underlays/users/joey.es.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 19:10-0300\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"
diff --git a/po/underlays/users/joey.fr.po b/po/underlays/users/joey.fr.po
index c929afc..457fa85 100644
--- a/po/underlays/users/joey.fr.po
+++ b/po/underlays/users/joey.fr.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-15 19:10-0300\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"
diff --git a/po/underlays/users/joey.sv.po b/po/underlays/users/joey.sv.po
index a430b02..457fa85 100644
--- a/po/underlays/users/joey.sv.po
+++ b/po/underlays/users/joey.sv.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-10-16 19:44-0300\n"
+"POT-Creation-Date: 2011-05-19 18:12+0000\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: ENCODING\n"

seems this went missing
diff --git a/po/underlays/users/joey.mdwn b/po/underlays/users/joey.mdwn
new file mode 100644
index 0000000..303feff
--- /dev/null
+++ b/po/underlays/users/joey.mdwn
@@ -0,0 +1 @@
+Joey Hess <joey@kitenet.net>

Update danish l10n of underlays.
(cherry picked from commit f893d11e8275ef31a79679aeb7d8ecb3fecc89cf)
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index fb394ae..24e0c55 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"
+"PO-Revision-Date: 2011-05-05 20:51+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,4 +76,4 @@ msgstr "[[søgning|ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.da.po b/po/underlays/basewiki/ikiwiki/directive.da.po
index 3c13491..95bffaf 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: da\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 2c4b678..2812aaa 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.da.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.da.po
@@ -1,16 +1,17 @@
 # Danish translation of basewiki/ikiwiki/formatting page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 13:39-0300\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: 2011-05-05 13:41+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,15 +45,11 @@ msgid "Leave blank lines between paragraphs."
 msgstr "hold afstand med blanke linjer mellem afsnit."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-#| "placing it in single or double asterisks."
 msgid ""
 "You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
 msgstr ""
-"du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at "
+"du kan *\\*fremhæve\\** eller **\\*\\*kraftigt fremhæve\\*\\*** tekst ved at "
 "placere det med enkelte eller dobbelte asterisker (stjerner) omkring."
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/markdown.da.po b/po/underlays/basewiki/ikiwiki/markdown.da.po
index ba2eb56..ded3d42 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: da\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/openid.da.po b/po/underlays/basewiki/ikiwiki/openid.da.po
index cb05119..5f91a84 100644
--- a/po/underlays/basewiki/ikiwiki/openid.da.po
+++ b/po/underlays/basewiki/ikiwiki/openid.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/openid page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"PO-Revision-Date: 2011-05-05 17:11+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,11 +57,14 @@ msgid ""
 "might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
+"Hvis du har en konto hos en af de større webservice-udbydere, har du måske "
+"allerede en OpenID.  [Katalog over OpenID-udbydere](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr ""
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -90,38 +93,3 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
-
-#~ msgid ""
-#~ "To sign up for an OpenID, visit one of the following identity providers:"
-#~ msgstr ""
-#~ "Du kan registrere en OpenID ved at besøge en af de følgende "
-#~ "identitetsudbydere:"
-
-#~ msgid "[MyOpenID](https://www.myopenid.com/)"
-#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#~ msgid "[GetOpenID](https://getopenid.com/)"
-#~ msgstr "[GetOpenID](https://getopenid.com/)"
-
-#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
-#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#~ msgid ""
-#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-#~ msgstr ""
-#~ "eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-
-#~ msgid ""
-#~ "Your OpenID is the URL that you are given when you sign up.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-#~ msgstr ""
-#~ "Din OpenID er den URL som du får når du registrerer dig.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-
-#~ msgid "[Videntity](http://videntity.org/)"
-#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index 42d05c7..fc84e27 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/pagespec page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011 Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.

(Diff truncated)
Update danish l10n of underlays.
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index fb394ae..24e0c55 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"
+"PO-Revision-Date: 2011-05-05 20:51+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,4 +76,4 @@ msgstr "[[søgning|ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.da.po b/po/underlays/basewiki/ikiwiki/directive.da.po
index bcdaca3..95bffaf 100644
--- a/po/underlays/basewiki/ikiwiki/directive.da.po
+++ b/po/underlays/basewiki/ikiwiki/directive.da.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 21:38+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"
+"Language: da\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 701d59c..2812aaa 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.da.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/formatting page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 21:38+0300\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"PO-Revision-Date: 2011-05-05 13:41+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,15 +45,11 @@ msgid "Leave blank lines between paragraphs."
 msgstr "hold afstand med blanke linjer mellem afsnit."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-#| "placing it in single or double asterisks."
 msgid ""
 "You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
 msgstr ""
-"du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at "
+"du kan *\\*fremhæve\\** eller **\\*\\*kraftigt fremhæve\\*\\*** tekst ved at "
 "placere det med enkelte eller dobbelte asterisker (stjerner) omkring."
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/markdown.da.po b/po/underlays/basewiki/ikiwiki/markdown.da.po
index 59d26c7..ded3d42 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.da.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.da.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-28 21:38+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"
+"Language: da\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/openid.da.po b/po/underlays/basewiki/ikiwiki/openid.da.po
index cb05119..5f91a84 100644
--- a/po/underlays/basewiki/ikiwiki/openid.da.po
+++ b/po/underlays/basewiki/ikiwiki/openid.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/openid page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"PO-Revision-Date: 2011-05-05 17:11+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,11 +57,14 @@ msgid ""
 "might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
+"Hvis du har en konto hos en af de større webservice-udbydere, har du måske "
+"allerede en OpenID.  [Katalog over OpenID-udbydere](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr ""
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -90,38 +93,3 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
-
-#~ msgid ""
-#~ "To sign up for an OpenID, visit one of the following identity providers:"
-#~ msgstr ""
-#~ "Du kan registrere en OpenID ved at besøge en af de følgende "
-#~ "identitetsudbydere:"
-
-#~ msgid "[MyOpenID](https://www.myopenid.com/)"
-#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#~ msgid "[GetOpenID](https://getopenid.com/)"
-#~ msgstr "[GetOpenID](https://getopenid.com/)"
-
-#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
-#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#~ msgid ""
-#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-#~ msgstr ""
-#~ "eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-
-#~ msgid ""
-#~ "Your OpenID is the URL that you are given when you sign up.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-#~ msgstr ""
-#~ "Din OpenID er den URL som du får når du registrerer dig.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-
-#~ msgid "[Videntity](http://videntity.org/)"
-#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index 42d05c7..fc84e27 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/pagespec page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>

(Diff truncated)
updated po/pot files after merge from master
ran: make underlays
diff --git a/po/underlays/basewiki/ikiwiki.pot b/po/underlays/basewiki/ikiwiki.pot
index 14021cd..5b9d616 100644
--- a/po/underlays/basewiki/ikiwiki.pot
+++ b/po/underlays/basewiki/ikiwiki.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/directive.pot b/po/underlays/basewiki/ikiwiki/directive.pot
index 80589ab..4de31ab 100644
--- a/po/underlays/basewiki/ikiwiki/directive.pot
+++ b/po/underlays/basewiki/ikiwiki/directive.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/formatting.pot b/po/underlays/basewiki/ikiwiki/formatting.pot
index 8357526..a643496 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.pot
+++ b/po/underlays/basewiki/ikiwiki/formatting.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/markdown.pot b/po/underlays/basewiki/ikiwiki/markdown.pot
index 4ff15eb..c1e9cf7 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.pot
+++ b/po/underlays/basewiki/ikiwiki/markdown.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/openid.pot b/po/underlays/basewiki/ikiwiki/openid.pot
index ffbf168..7c290a2 100644
--- a/po/underlays/basewiki/ikiwiki/openid.pot
+++ b/po/underlays/basewiki/ikiwiki/openid.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.pot b/po/underlays/basewiki/ikiwiki/pagespec.pot
index 3afeea6..55f52df 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot b/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
index 59b44e0..64a3407 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.pot b/po/underlays/basewiki/ikiwiki/pagespec/po.pot
index a871f48..cb9b0c7 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.pot b/po/underlays/basewiki/ikiwiki/pagespec/sorting.pot
index 8268fb2..4be56b1 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/sorting.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/searching.pot b/po/underlays/basewiki/ikiwiki/searching.pot
index ff34912..f7ee23c 100644
--- a/po/underlays/basewiki/ikiwiki/searching.pot
+++ b/po/underlays/basewiki/ikiwiki/searching.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage.pot b/po/underlays/basewiki/ikiwiki/subpage.pot
index e446627..14cde7a 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.pot
+++ b/po/underlays/basewiki/ikiwiki/subpage.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
index 483a8ab..b41caea 100644
--- a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
+++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/ikiwiki/wikilink.pot b/po/underlays/basewiki/ikiwiki/wikilink.pot
index 9b87b48..7db3824 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.pot
+++ b/po/underlays/basewiki/ikiwiki/wikilink.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/index.pot b/po/underlays/basewiki/index.pot
index 65fa1fe..1f7cff0 100644
--- a/po/underlays/basewiki/index.pot
+++ b/po/underlays/basewiki/index.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/recentchanges.pot b/po/underlays/basewiki/recentchanges.pot
index 03d58b1..0bb502a 100644
--- a/po/underlays/basewiki/recentchanges.pot
+++ b/po/underlays/basewiki/recentchanges.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-05-19 13:18-0400\n"
+"POT-Creation-Date: 2011-05-19 13:37-0400\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"
diff --git a/po/underlays/basewiki/sandbox.pot b/po/underlays/basewiki/sandbox.pot
index f813ae2..a32ad22 100644
--- a/po/underlays/basewiki/sandbox.pot
+++ b/po/underlays/basewiki/sandbox.pot
@@ -7,7 +7,7 @@

(Diff truncated)
revert massive l10n refersh
This reverts commit 5a82bc5e8799e2569cd256ef8274f00e8eff5d76
and commit 55dc24616892497a32e48ad349ebd16fac71e738.
That turns out to not be the way l10n of underlays is handled, instead
these changes are being made to the l10n branch, and the Danish
underlay translation update will be copied into master from that
branch.
This is necessary to avoid tying that branch up in a state where
it is horribly diverged from master and cannot be updated anymore.
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index 24e0c55..fb394ae 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki page for ikiwiki.
-# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.20110430\n"
+"Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2011-05-05 20:51+0200\n"
+"PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: da\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,4 +76,4 @@ msgstr "[[søgning|ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
index 3c9205c..984c776 100644
--- a/po/underlays/basewiki/ikiwiki/directive.cs.po
+++ b/po/underlays/basewiki/ikiwiki/directive.cs.po
@@ -6,11 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki/basewiki\n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2009-08-28 02:49-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 95bffaf..3c13491 100644
--- a/po/underlays/basewiki/ikiwiki/directive.da.po
+++ b/po/underlays/basewiki/ikiwiki/directive.da.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2009-07-19 23:45+0200\n"
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: da\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 b74781b..d969f81 100644
--- a/po/underlays/basewiki/ikiwiki/directive.de.po
+++ b/po/underlays/basewiki/ikiwiki/directive.de.po
@@ -4,11 +4,10 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2010-03-12 09:29+0530\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"
@@ -27,8 +26,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
@@ -48,9 +47,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
@@ -62,8 +61,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
@@ -77,12 +76,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
@@ -114,11 +113,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
@@ -134,3 +133,5 @@ 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 82e72c6..91fa89e 100644
--- a/po/underlays/basewiki/ikiwiki/directive.es.po
+++ b/po/underlays/basewiki/ikiwiki/directive.es.po
@@ -6,11 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2009-08-15 18:30-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"
@@ -26,8 +25,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
@@ -39,16 +38,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:"

(Diff truncated)
updated po/pot files after merge from master
ran: make underlays
diff --git a/po/underlays/basewiki/ikiwiki.pot b/po/underlays/basewiki/ikiwiki.pot
index c263c5b..14021cd 100644
--- a/po/underlays/basewiki/ikiwiki.pot
+++ b/po/underlays/basewiki/ikiwiki.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-10 15:51-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
@@ -64,3 +65,7 @@ msgstr ""
 #. type: Bullet: '* '
 msgid "[[ikiwiki/searching]]"
 msgstr ""
+
+#. type: Bullet: '* '
+msgid "[[templates]]"
+msgstr ""
diff --git a/po/underlays/basewiki/ikiwiki/directive.pot b/po/underlays/basewiki/ikiwiki/directive.pot
index a0def64..80589ab 100644
--- a/po/underlays/basewiki/ikiwiki/directive.pot
+++ b/po/underlays/basewiki/ikiwiki/directive.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 19:19-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/basewiki/ikiwiki/formatting.pot b/po/underlays/basewiki/ikiwiki/formatting.pot
index 2301457..8357526 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.pot
+++ b/po/underlays/basewiki/ikiwiki/formatting.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 19:19-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/basewiki/ikiwiki/markdown.pot b/po/underlays/basewiki/ikiwiki/markdown.pot
index c25ba03..4ff15eb 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.pot
+++ b/po/underlays/basewiki/ikiwiki/markdown.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 19:18-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/basewiki/ikiwiki/openid.pot b/po/underlays/basewiki/ikiwiki/openid.pot
index f854c3c..ffbf168 100644
--- a/po/underlays/basewiki/ikiwiki/openid.pot
+++ b/po/underlays/basewiki/ikiwiki/openid.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 19:18-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
@@ -41,40 +42,15 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[Videntity](http://videntity.org/)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
 msgid ""
-"or any of the [many others out "
-"there](http://openiddirectory.com/openid-providers-c-1.html)"
+"If you have an account with some of the larger web service providers, you "
+"might already have an OpenID.  [Directory of OpenID "
+"providers](http://openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid ""
-"Your OpenID is the URL that you are given when you sign up.\n"
-"[[!if test=\"enabled(openid)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.pot b/po/underlays/basewiki/ikiwiki/pagespec.pot
index 3011b5b..3afeea6 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.pot
+++ b/po/underlays/basewiki/ikiwiki/pagespec.pot
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-08-28 19:18-0300\n"
+"POT-Creation-Date: 2011-05-19 13:18-0400\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: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
@@ -68,86 +69,49 @@ msgid ""
 "functions:"
 msgstr ""
 
-#. type: Bullet: '* '
-msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)"
-msgstr ""
-
-#. type: Bullet: '* '
-msgid ""
-"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
-"(or tags matched by a glob)"
-msgstr ""
-
-#. type: Bullet: '* '

(Diff truncated)
instructions for me
diff --git a/po/underlays/index.mdwn b/po/underlays/index.mdwn
index 85a3ad4..dd2c11b 100644
--- a/po/underlays/index.mdwn
+++ b/po/underlays/index.mdwn
@@ -50,6 +50,19 @@ these steps:
 
 6. Keep an eye on [[needstranslation]] to keep your translation up-to-date.
 
+## Instructions for Joey
+
+This branch of ikiwiki is diverged from ikiwiki master, and should never
+be directly merged into master. Remember to merge master into it from time
+to time. After merging in master, the translatable underlays can be updated
+by running `cd po && make underlays`. Then check in any new po and pot
+files to the l10n branch.
+(Similarly, that should never be run on the master branch.)
+
+When receiving a translation via this site, the po files have to be copied
+over to master by hand. This way, only translations that are in a
+consistent/complete state can land in master.
+
 ## Requests for translation
 
 * Czech: Hi Joey, could you please enable Czech (cs) language?

Merge commit '44b6101c3f563f6077e38f6843f0d4b41704f11a' into l10n
Conflicts:
po/underlays/basewiki/ikiwiki/openid.fr.po
po/underlays/basewiki/ikiwiki/subpage.fr.po
po/underlays/basewiki/ikiwiki/wikilink.fr.po
po/underlays/basewiki/templates.fr.po
po/underlays/directives/ikiwiki/directive/calendar.fr.po
po/underlays/directives/ikiwiki/directive/linkmap.fr.po
po/underlays/directives/ikiwiki/directive/pagestats.fr.po
po/underlays/directives/ikiwiki/directive/template.fr.po
l10n unfortunatly was allowed to diverge from master when merging
translation updated from l10.ikiwiki.info manually. Fix that.
In deciding which version of a translation to use when resolving the
conflicts, I preferred the newer one.
Update danish l10n of underlays.
diff --git a/po/underlays/basewiki/ikiwiki.da.po b/po/underlays/basewiki/ikiwiki.da.po
index fb394ae..24e0c55 100644
--- a/po/underlays/basewiki/ikiwiki.da.po
+++ b/po/underlays/basewiki/ikiwiki.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"
+"PO-Revision-Date: 2011-05-05 20:51+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,4 +76,4 @@ msgstr "[[søgning|ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/directive.da.po b/po/underlays/basewiki/ikiwiki/directive.da.po
index b986cf9..95bffaf 100644
--- a/po/underlays/basewiki/ikiwiki/directive.da.po
+++ b/po/underlays/basewiki/ikiwiki/directive.da.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\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 5dba227..2812aaa 100644
--- a/po/underlays/basewiki/ikiwiki/formatting.da.po
+++ b/po/underlays/basewiki/ikiwiki/formatting.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/formatting page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-05 20:04+0300\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"PO-Revision-Date: 2011-05-05 13:41+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,15 +45,11 @@ msgid "Leave blank lines between paragraphs."
 msgstr "hold afstand med blanke linjer mellem afsnit."
 
 #. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-#| "placing it in single or double asterisks."
 msgid ""
 "You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
 "placing it in single or double asterisks."
 msgstr ""
-"du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at "
+"du kan *\\*fremhæve\\** eller **\\*\\*kraftigt fremhæve\\*\\*** tekst ved at "
 "placere det med enkelte eller dobbelte asterisker (stjerner) omkring."
 
 #. type: Plain text
diff --git a/po/underlays/basewiki/ikiwiki/markdown.da.po b/po/underlays/basewiki/ikiwiki/markdown.da.po
index 396b347..ded3d42 100644
--- a/po/underlays/basewiki/ikiwiki/markdown.da.po
+++ b/po/underlays/basewiki/ikiwiki/markdown.da.po
@@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-07-19 23:45+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\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/openid.da.po b/po/underlays/basewiki/ikiwiki/openid.da.po
index cb05119..5f91a84 100644
--- a/po/underlays/basewiki/ikiwiki/openid.da.po
+++ b/po/underlays/basewiki/ikiwiki/openid.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/openid page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011, Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-07-22 21:28+0200\n"
+"PO-Revision-Date: 2011-05-05 17:11+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,11 +57,14 @@ msgid ""
 "might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
 msgstr ""
+"Hvis du har en konto hos en af de større webservice-udbydere, har du måske "
+"allerede en OpenID.  [Katalog over OpenID-udbydere](http://"
+"openiddirectory.com/openid-providers-c-1.html)"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr ""
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""
@@ -90,38 +93,3 @@ msgid ""
 msgstr ""
 "\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
 "\t       server=\"http://www.myopenid.com/server\"]]\n"
-
-#~ msgid ""
-#~ "To sign up for an OpenID, visit one of the following identity providers:"
-#~ msgstr ""
-#~ "Du kan registrere en OpenID ved at besøge en af de følgende "
-#~ "identitetsudbydere:"
-
-#~ msgid "[MyOpenID](https://www.myopenid.com/)"
-#~ msgstr "[MyOpenID](https://www.myopenid.com/)"
-
-#~ msgid "[GetOpenID](https://getopenid.com/)"
-#~ msgstr "[GetOpenID](https://getopenid.com/)"
-
-#~ msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-#~ msgstr "[LiveJournal](http://www.livejournal.com/openid/)"
-
-#~ msgid "[TrustBearer](https://openid.trustbearer.com/)"
-#~ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
-
-#~ msgid ""
-#~ "or any of the [many others out there](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-#~ msgstr ""
-#~ "eller enhver af de [mange andre derude](http://openiddirectory.com/openid-"
-#~ "providers-c-1.html)"
-
-#~ msgid ""
-#~ "Your OpenID is the URL that you are given when you sign up.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-#~ msgstr ""
-#~ "Din OpenID er den URL som du får når du registrerer dig.\n"
-#~ "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-
-#~ msgid "[Videntity](http://videntity.org/)"
-#~ msgstr "[Videntity](http://videntity.org/)"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.da.po b/po/underlays/basewiki/ikiwiki/pagespec.da.po
index b49e649..fc84e27 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.da.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.da.po
@@ -1,17 +1,17 @@
 # Danish translation of basewiki/ikiwiki/pagespec page for ikiwiki.
-# Copyright (C) 2008-2009 Jonas Smedegaard <dr@jones.dk>
+# Copyright (C) 2008, 2009, 2011 Jonas Smedegaard <dr@jones.dk>
 # This file is distributed under the same license as the ikiwiki package.
 # Jonas Smedegaard <dr@jones.dk>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki 3.15\n"
+"Project-Id-Version: ikiwiki 3.20110430\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-05-05 20:04+0300\n"
-"PO-Revision-Date: 2009-07-19 23:45+0200\n"

(Diff truncated)
Refresh gettext files of underlays.
diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
index 984c776..3c9205c 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 3c13491..b986cf9 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 d969f81..b74781b 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 91fa89e..82e72c6 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 "

(Diff truncated)
Typo
(cherry picked from commit bde361bb052de7cb4455eb20f3d03fa163d38bc8)
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 455c814..a6cced4 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -55,7 +55,7 @@ msgstr "Si vous possédez un compte sur l'un des nombreux fournisseurs de servic
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(openid)\" then=\"\"\n"
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""

Typo
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 455c814..a6cced4 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -55,7 +55,7 @@ msgstr "Si vous possédez un compte sur l'un des nombreux fournisseurs de servic
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(openid)\" then=\"\"\n"
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
 
 #. type: Plain text
 msgid ""

Typos
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 8c0a2f0..f36d1c3 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-28 21:38+0300\n"
-"PO-Revision-Date: 2010-07-23 17:54+0200\n"
+"PO-Revision-Date: 2010-07-31 08:17+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -28,11 +28,7 @@ msgid ""
 "`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."
+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 le sous-répertoire `templates/` du répertoire source du wiki."
 
 #. type: Plain text
 msgid ""
@@ -62,10 +58,7 @@ msgstr ""
 msgid ""
 "To use one block of text if a variable is set and a second if it's not, use "
 "`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
-"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
-"le cas contraire, utilisez `<TMPL_IF variable>texte<TMPL_ELSE>autre texte</"
-"TMPL_IF>`."
+msgstr "Pour utiliser un bloc de texte si une variable est définie et un autre texte dans le cas contraire, utilisez `<TMPL_IF variable>texte<TMPL_ELSE>autre texte</TMPL_IF>`."
 
 #. type: Plain text
 #, no-wrap
@@ -196,7 +189,7 @@ msgstr ""
 "* `blogpost.tmpl` - offre un formulaire pour ajouter un message dans un blog (avec des liens RSS/Atom)\n"
 "* `feedlink.tmpl` - permet d'ajouter des liens RSS/Atom quand `blogpost.tmpl` n'est pas utilisé.\n"
 "* `aggregatepost.tmpl` - modèle utilisé par le module aggregate pour créer une page de blog.\n"
-"* `searchform.tmpl`, `googleform.tmpl` - modèles utilisés par les modules search et.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - modèles utilisés par les modules search et\n"
 "  google pour ajouter un formulaire de recherche dans les pages de wiki.\n"
 "* `searchquery.tmpl` - modèle Omega, utilisé par le module search.\n"
 "* `comment.tmpl` - modèle utilisé par le module comments pour afficher un commentaire.\n"
diff --git a/po/underlays/directives/ikiwiki/directive/template.fr.po b/po/underlays/directives/ikiwiki/directive/template.fr.po
index 047f002..da1d8d5 100644
--- a/po/underlays/directives/ikiwiki/directive/template.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/template.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-28 21:38+0300\n"
-"PO-Revision-Date: 2010-07-21 18:19+0200\n"
+"PO-Revision-Date: 2010-07-31 08:29+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -70,11 +70,7 @@ msgid ""
 "page outside the template. Triple-quoting the value even allows quotes to be "
 "included in it. Combined with multi-line quoted values, this allows for "
 "large chunks of marked up text to be embedded into a template:"
-msgstr ""
-"Une valeur peut contenir tout marquage autorisé dans une page de wiki "
-"externe au modèle. On peut même inclure des guillemets dans la valeur, en "
-"les triplant. Avec des valeurs sur plusieurs lignes entre guillemets, on "
-"peut ainsi insérer de longs passages de texte dans un modèle."
+msgstr "Une valeur peut contenir tout marquage autorisé dans une page de wiki externe au modèle. On peut même inclure des guillemets dans la valeur, il suffit de les tripler. Avec des valeurs sur plusieurs lignes entre guillemets, on peut ainsi insérer de longs passages de texte dans un modèle."
 
 #. type: Plain text
 #, no-wrap
@@ -158,18 +154,13 @@ msgstr ""
 msgid ""
 "To make a block of text conditional on a variable being set use `<TMPL_IF "
 "variable>text</TMPL_IF>`."
-msgstr ""
-"Pour rendre un texte dépendant d'une variable, utilisez  `<TMPL_IF "
-"variable>text</TMPL_IF>`  "
+msgstr "Pour rendre un texte dépendant d'une variable, utilisez `<TMPL_IF variable>text</TMPL_IF>`."
 
 #. type: Bullet: '* '
 msgid ""
 "To use one block of text if a variable is set and a second if it's not, use "
 "`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
-"Pour utiliser un texte quand une variable est définie et un autre texte "
-"quand elle n'est pas définie, utilisez `<TMPL_IF "
-"variable>text<TMPL_ELSE>other text</TMPL_IF>`"
+msgstr "Pour utiliser un texte quand une variable est définie et un autre texte quand elle n'est pas définie, utilisez `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`."
 
 #. type: Plain text
 msgid "Here's a sample template:"

updated PO files
diff --git a/po/underlays/basewiki/ikiwiki/directive.cs.po b/po/underlays/basewiki/ikiwiki/directive.cs.po
index 984c776..c3bc5be 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: 2010-07-28 21:38+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 3c13491..bcdaca3 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: 2010-07-28 21:38+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 d969f81..9690f00 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: 2010-07-28 21:38+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 91fa89e..e726a78 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: 2010-07-28 21:38+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 "

(Diff truncated)
another test.
diff --git a/po/underlays/smiley/smileys.es.po b/po/underlays/smiley/smileys.es.po
index 4241188..f4bd0dc 100644
--- a/po/underlays/smiley/smileys.es.po
+++ b/po/underlays/smiley/smileys.es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2009-08-15 18:30-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-07-28 19:41+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid "\\\\:)\t[[smileys/smile.png]]"
-msgstr ""
+msgstr "\\\\:)\t[[smileys/smile.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\:-)\t[[smileys/smile.png]]"

test for the buggy edit links on unstranslatable pages bug.
diff --git a/po/underlays/smiley/smileys.sv.po b/po/underlays/smiley/smileys.sv.po
index ae7c8bb..4be08ab 100644
--- a/po/underlays/smiley/smileys.sv.po
+++ b/po/underlays/smiley/smileys.sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2009-10-16 19:45-0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2010-07-28 19:40+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 
 #. type: Bullet: '* '
 msgid "\\\\:)\t[[smileys/smile.png]]"
-msgstr ""
+msgstr "\\\\:)\t[[smileys/smile.png]]"
 
 #. type: Bullet: '* '
 msgid "\\\\:-)\t[[smileys/smile.png]]"

Unfuzzy popup
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
index 33384e0..3da1682 100644
--- a/po/underlays/basewiki/templates/popup.fr.po
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-24 09:48+0200\n"
+"PO-Revision-Date: 2010-07-25 10:03+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<TMPL_UNLESS NAME=\"mouseover\">\n"
 #| "Use this template to create a popup window that is displayed when the mouse\n"
diff --git a/po/underlays/directives/ikiwiki/directive/paste.fr.po b/po/underlays/directives/ikiwiki/directive/paste.fr.po
index 8afabb5..5ce31e1 100644
--- a/po/underlays/directives/ikiwiki/directive/paste.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/paste.fr.po
@@ -1,26 +1,24 @@
-# 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.
+# Traduction de ikiwiki
+# Copyright (C)2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the PACKAGE Ikiwiki.
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2009-08-15 18:30-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"
+"PO-Revision-Date: 2010-07-25 10:09+0200\n"
+"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
-msgstr ""
+msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr ""
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"

French update 5
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
index 760e3cf..83f41ad 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-30 09:37+0200\n"
+"PO-Revision-Date: 2010-07-24 10:00+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -58,7 +58,7 @@ msgid ""
 "slave pages match this PageSpec. A minimum target translation percentage can "
 "optionally be passed as an integer parameter: \"`needstranslation(50)`\" "
 "matches only pages less than 50% translated."
-msgstr ""
+msgstr "\"`needstranslation()`\" - teste si une page a besoin de traduction. Seules les pages esclaves correspondent à cette spécification (PageSpec). Un pourcentage minimum requis peut être passé comme paramètre (entier) : \"`needstranslation(50)`\" recherche seulement les pages traduites à 50% ou moins."
 
 #. type: Plain text
 msgid ""
@@ -72,4 +72,4 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
-msgstr ""
+msgstr "[[!meta robots=\"noindex, follow\"]]\n"
diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po
index c9bfaa2..0ff1a62 100644
--- a/po/underlays/basewiki/templates/note.fr.po
+++ b/po/underlays/basewiki/templates/note.fr.po
@@ -2,21 +2,20 @@
 # Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the PACKAGE Ikiwiki.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-24 00:18+0200\n"
+"PO-Revision-Date: 2010-07-24 09:42+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "<div class=\"notebox\">\n"
 #| "<TMPL_VAR text>\n"
@@ -45,7 +44,7 @@ msgstr ""
 "<div class=\"notebox\">\n"
 "<TMPL_VAR text>\n"
 "</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
 "Utilisez ce modèle pour insérer une note dans une page. La note sera placée à la droite du texte de la page. Ce modèle possède un paramètre :\n"
 "<ul>\n"
 "<li>`text` - le texte à afficher dans la note\n"
diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po
index b104d31..33384e0 100644
--- a/po/underlays/basewiki/templates/popup.fr.po
+++ b/po/underlays/basewiki/templates/popup.fr.po
@@ -6,13 +6,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-24 10:27+0200\n"
+"PO-Revision-Date: 2010-07-24 09:48+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -51,7 +51,7 @@ msgid ""
 "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
 msgstr ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
 "Utilisez ce modèle pour créer un popup qui est affiché lorsque la souris est au dessus d'une partie de la page. Ce modèle possède deux paramètres :\n"
 "<ul>\n"
 "<li>`mouseover` - Ce paramètre indique le contenu (texte ou autre) qui déclenche le popup.\n"
diff --git a/po/underlays/directives/ikiwiki/directive/format.fr.po b/po/underlays/directives/ikiwiki/directive/format.fr.po
index a16269c..af62e5e 100644
--- a/po/underlays/directives/ikiwiki/directive/format.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/format.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-03-14 22:09+0000\n"
-"PO-Revision-Date: 2010-07-17 16:05+0200\n"
+"PO-Revision-Date: 2010-07-24 10:03+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr ""
 "reconnus. Par exemple :"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "\t\\[[format perl \"\"\"\n"
 msgid "\t\\[[!format perl \"\"\"\n"
 msgstr "\t\\[[!format perl \"\"\"\n"
diff --git a/po/underlays/directives/ikiwiki/directive/img.fr.po b/po/underlays/directives/ikiwiki/directive/img.fr.po
index 17322b3..c96ccad 100644
--- a/po/underlays/directives/ikiwiki/directive/img.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/img.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-17 16:04+0200\n"
+"PO-Revision-Date: 2010-07-23 21:22+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -67,7 +67,6 @@ msgstr ""
 "calculée selon le format d'image, \"200x\", \"x200\"."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "You can also pass `alt`, `title`, `class`, `align` and `id` parameters.  "
 #| "These are passed through unchanged to the html img tag. If you include a "
@@ -78,10 +77,7 @@ msgid ""
 "`vspace` parameters.  These are passed through unchanged to the html img "
 "tag. If you include a `caption` parameter, the caption will be displayed "
 "centered beneath the image."
-msgstr ""
-"Vous pouvez aussi spécifier les paramètres `alt`, `title`, `class`, `align` "
-"et `id`. Ils sont passés inchangés à la balise HTML « img ». Si vous ajoutez "
-"un paramètre `caption`, le sous-titre sera centré sous l'image."
+msgstr "Vous pouvez aussi spécifier les paramètres `alt`, `title`, `class`, `align`, `id`, `hspace` et `vspace`. Ils sont passés inchangés à la balise HTML « img ». Si vous ajoutez un paramètre `caption`, le sous-titre sera centré sous l'image."
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/directives/ikiwiki/directive/meta.fr.po b/po/underlays/directives/ikiwiki/directive/meta.fr.po
index 728955b..b1a45e5 100644
--- a/po/underlays/directives/ikiwiki/directive/meta.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/meta.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-17 15:30+0200\n"
+"PO-Revision-Date: 2010-07-23 21:15+0200\n"
 "Last-Translator:  Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -87,17 +87,17 @@ msgstr ""
 msgid ""
 "  An optional `sortas` parameter will be used preferentially when\n"
 "  [[ikiwiki/pagespec/sorting]] by `meta(title)`:\n"
-msgstr ""
+msgstr "Un paramètre facultatif `sortas` sera utilisé de préférence quand le tri [[ikiwiki/pagespec/sorting]] est fait par `meta(title)` :\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
-msgstr ""
+msgstr "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
-msgstr ""
+msgstr "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
 
 #. type: Bullet: '* '
 msgid "license"
@@ -139,12 +139,12 @@ msgstr "  L'auteur de la page.\n"
 msgid ""
 "  An optional `sortas` parameter will be used preferentially when\n"
 "  [[ikiwiki/pagespec/sorting]] by `meta(author)`:\n"
-msgstr ""
+msgstr "Un paramètre facultatif `sortas` sera utilisé de préférence quand le tri [[ikiwiki/pagespec/sorting]] est fait par `meta(author)` :\n"
 
 #. type: Plain text
 #, no-wrap
 msgid "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
-msgstr ""
+msgstr "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
 
 #. type: Bullet: '* '
 msgid "authorurl"
diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.fr.po

(Diff truncated)
reviewed by D. Prévot
diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
index 9985f9c..2fdc1b6 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-26 14:46+0200\n"
+"PO-Revision-Date: 2010-07-22 18:06+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -41,7 +41,6 @@ msgstr ""
 "`allowed_attachments`."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "For example, to limit arbitrary files to 50 kilobytes, but allow larger "
 #| "mp3 files to be uploaded by joey into a specific directory, and check all "
@@ -51,17 +50,13 @@ msgid ""
 "else, while allowing larger mp3 files to be uploaded by joey into a specific "
 "directory, and check all attachments for viruses, something like this could "
 "be used:"
-msgstr ""
-"Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre "
-"que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire "
-"donné et pour vérifier que toutes les pièces jointes sont sans virus, on "
-"peut utiliser quelque chose comme ça :"
+msgstr "Par exemple, pour n'autoriser à la plupart des utisateurs que l'envoi de petites images et rien d'autre, tout en permettant que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire donné, et pour vérifier que toutes les pièces jointes sont sans virus, on peut utiliser quelque chose comme ça :"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
 msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
-msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index 715ef92..53f39b7 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-22 17:30+0200\n"
+"PO-Revision-Date: 2010-07-23 17:54+0200\n"
 "Last-Translator: Alexandre Dupas <alexandre.dupas@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -71,10 +71,7 @@ msgstr ""
 msgid ""
 "To use one block of text if a variable is set and a second if it's not, use "
 "`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
-msgstr ""
-"Pour utiliser un bloc de texte si une variable est définie et un autre dans "
-"le cas contraire, utilisez `<TMPL_IF variable>texte<TMPL_ELSE>autre texte</"
-"TMPL_IF>`"
+msgstr "Pour utiliser un bloc de texte si une variable est définie et un autre dans le cas contraire, utilisez `<TMPL_IF variable>texte<TMPL_ELSE>autre texte</TMPL_IF>`."
 
 #. type: Plain text
 #, no-wrap
@@ -113,10 +110,7 @@ msgid ""
 "The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
 "can be used to make new pages default to containing text from a template "
 "page, which can be filled out as the page is edited."
-msgstr ""
-"La directive [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate\"]] "
-"permet que le contenu par défaut des nouvelles pages soit le texte d'une "
-"page modèle, qui peut être remplie en même temps que la page est modifiée."
+msgstr "La directive [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate\"]] permet que le contenu par défaut des nouvelles pages soit le texte d'une page modèle, texte qui peut être complété en même temps que la page est modifiée."
 
 #. type: Plain text
 #, no-wrap
@@ -125,7 +119,7 @@ msgid ""
 "[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
 "and enabled(inline)\" then=\"\"\"\n"
 msgstr ""
-"[[!if test=\"enabled(template) or enabled(edittemplate))\n"
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
 "and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
@@ -213,7 +207,7 @@ msgstr ""
 "* `aggregatepost.tmpl` - modèle utilisé par le module aggregate pour créer une page de blog.\n"
 "* `searchform.tmpl`, `googleform.tmpl` - modèles utilisés par les modules search et.\n"
 "  google pour ajouter un formulaire de recherche dans les pages de wiki.\n"
-"* `searchquery.tmpl` - C'est un modèle Omega, utilisé par le module search.\n"
+"* `searchquery.tmpl` - modèle Omega, utilisé par le module search.\n"
 "* `comment.tmpl` - modèle utilisé par le module comments pour afficher un commentaire.\n"
 "* `change.tmpl` - permet la création d'une page décrivant une modification du wiki.\n"
 "* `recentchanges.tmpl` - permet de lister une modification sur la page RecentChanges.\n"
@@ -225,7 +219,7 @@ msgstr ""
 "  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
 "  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
 "  `passwordmail.tmpl`, `openid-selector.tmpl` - modèles faisant partie de l'interface utilisateur\n"
-"  d'ikiwiki'. Il n'y a en général aucun besoin de les personnaliser.\n"
+"  d'ikiwiki. Il n'y a en général aucun besoin de les personnaliser.\n"
 
 #. type: Plain text
 #, no-wrap
diff --git a/po/underlays/directives/ikiwiki/directive/comment.fr.po b/po/underlays/directives/ikiwiki/directive/comment.fr.po
index 74a6f72..2a4b41a 100644
--- a/po/underlays/directives/ikiwiki/directive/comment.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/comment.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-17 16:07+0200\n"
+"PO-Revision-Date: 2010-07-22 18:22+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid ""
 "`nickname` - Name to display for a logged in commenter.  (Optional; used for "
 "OpenIDs.)"
-msgstr ""
+msgstr "Nom à afficher pour un commentateur présent. Facultatif. Utilisé avec les OpenID."
 
 #. type: Bullet: '* '
 msgid ""
diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
index fea0464..dc1c3c4 100644
--- a/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/edittemplate.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-05 08:36+0200\n"
+"PO-Revision-Date: 2010-07-22 21:41+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -75,7 +75,7 @@ msgstr ""
 "\tDétails : \n"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "The template page can also contain [[!cpan HTML::Template]] directives,\n"
 #| "similar to other ikiwiki [[templates]]. Currently only one variable is\n"
diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
index f78bd99..c4bb8ac 100644
--- a/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/pagestats.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-17 11:31+0200\n"
+"PO-Revision-Date: 2010-07-22 18:11+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -33,7 +33,6 @@ msgstr ""
 "tableau montrant le nombre de liens de chaque page."
 
 #. type: Plain text
-#, fuzzy
 #| msgid "Here's how to use it to create a [[tag]] cloud:"
 msgid ""
 "Here's how to use it to create a [[tag]] cloud, with tags sized based on "
@@ -52,7 +51,7 @@ msgid ""
 msgstr "Voici comment afficher une liste d'étiquettes, avec la taille des étiquettes proportionnelle à la fréquence d'utilisation, comme pour un nuage :"
 
 #. type: Plain text
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
 msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
 msgstr "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
@@ -108,7 +107,6 @@ msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
 
 #. type: Plain text
-#, fuzzy
 msgid ""
 "The optional `class` parameter can be used to control the class of the "
 "generated tag cloud `div` or page stats `table`."
diff --git a/po/underlays/directives/ikiwiki/directive/tag.fr.po b/po/underlays/directives/ikiwiki/directive/tag.fr.po
index 08981c7..be6c7b8 100644
--- a/po/underlays/directives/ikiwiki/directive/tag.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/tag.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-01 16:20+0200\n"
+"PO-Revision-Date: 2010-07-22 21:35+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

(Diff truncated)
merge translation updates from l10n site
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
index 5516a95..2d5e03b 100644
--- a/po/underlays/basewiki/ikiwiki.fr.po
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the PACKAGE Ikiwiki.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-30 09:46+0200\n"
+"PO-Revision-Date: 2010-07-21 16:41+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -71,4 +70,4 @@ msgstr "[[ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po
index 2f41cf7..455c814 100644
--- a/po/underlays/basewiki/ikiwiki/openid.fr.po
+++ b/po/underlays/basewiki/ikiwiki/openid.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-25 09:52+0200\n"
+"PO-Revision-Date: 2010-07-20 21: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"
@@ -50,12 +50,12 @@ msgid ""
 "If you have an account with some of the larger web service providers, you "
 "might already have an OpenID.  [Directory of OpenID providers](http://"
 "openiddirectory.com/openid-providers-c-1.html)"
-msgstr ""
+msgstr "Si vous possédez un compte sur l'un des nombreux fournisseurs de services web, il se peut que vous ayez déjà un OpenID. [Répertoire des fournisseurs d'OpenID](http://openiddirectory.com/openid-providers-c-1.html)."
 
 #. type: Plain text
 #, no-wrap
 msgid "[[!if test=\"enabled(openid)\" then=\"\"\"\n"
-msgstr ""
+msgstr "[[!if test=\"enabled(openid)\" then=\"\"\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index b95b818..aef5c74 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-16 10:47+0200\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"
 "Language: fr\n"
@@ -121,6 +121,32 @@ msgid ""
 "* \"`postcomment(glob)`\" - matches only when comments are being \n"
 "  posted to a page matching the specified glob\n"
 msgstr ""
+"* \"`glob(motif)`\" - recherche les pages et fichiers qui correspondent au motif.\n"
+"  N'écrire que le motif lui-même est un raccourci pour cette fonction.\n"
+"* \"`page(motif)`\" - comme `glob()`, mais ne recherche que des pages, pas des fichiers.\n"
+"* \"`link(page)`\" -  correspond aux pages ayant un lien vers cette page (ou motif)\n"
+"* \"`tagged(étiquette)`\" - correspond aux pages qui sont marquées ou qui sont\n"
+"  liées à l'étiquette donnée (ou des étiquettes correspondant à un motif).\n"
+"* \"`backlink(page)`\" -  correspond seulement aux pages qui sont pointées (lien) par la page donnée.\n"
+"* \"`creation_month(mois)`\" - correspond aux pages créées durant ce mois\n"
+"* \"`creation_day(jour)`\" - ou au jour de ce mois\n"
+"* \"`creation_year(année)`\" - ou année\n"
+"* \"`created_after(page)`\" - correspond aux fichiers créés après la création de la page donnée.\n"
+"* \"`created_before(page)`\\\" - correspond aux fichiers créés avant la création de la page donnée.\n"
+"* \"`internal(motif)`\" - comme `glob()`,  mais correspond en plus aux\n"
+"  pages à usage interne que la fonction glob ne trouve pas en général.\n"
+"* \"`title(motif)`\", \"`author(motif)`\", \"`authorurl(motif)`\",\n"
+"  \"`license(motif)`\", \"`copyright(motif)`\", \"`guid(motif)`\"\n"
+"  -  renvoient les pages qui possèdent les métadonnées correspondant au motif donné.\n"
+"* \"`user(username)`\" - teste si une modification est faite par l'identifiant donné.\n"
+"  Si openid est activé, on peut aussi l'utiliser. L'identifiant peut contenir des expressions régulières.\n"
+"  Par exemple, pour obtenir tous les utilisateurs openid, utilisez l'expression : `user(*://*)`.\n"
+"* \"`admin()`\" - teste si une modification par un administrateur du wiki est en cours.\n"
+"* \"`ip(adresse)`\" - teste si une modification par l'IP donnée est en cours.\n"
+"* \"`comment(motif)`\" - renvoient les commentaires d'une page correspondant au motif donné.\n"
+"* \"`comment_pending(motif)`\" - renvoient les commentaires non modérés, en attente.\n"
+"* \"`postcomment(motif)`\" -  ne correspond que si des commentaires sont postés\n"
+"  vers une page correspondant au motif donné.\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index 61264b4..5df0b71 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-25 10:31+0200\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"
 "Language: fr\n"
@@ -33,7 +33,6 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "To add a SubPage, just make a subdirectory and put pages in it. For "
 #| "example, this page is SubPage.mdwn in this wiki's source, and there is "
@@ -44,12 +43,7 @@ msgid ""
 "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/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index f527ef3..9998bbe 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-28 16:05+0200\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"
 "Language: fr\n"
@@ -76,22 +76,19 @@ msgstr ""
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Also, if the file linked to by a WikiLink looks like an image, it will be "
 #| "displayed inline on the page."
 msgid ""
 "If the file linked to by a WikiLink looks like an image, it will be "
 "displayed inline on the page."
-msgstr ""
-"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
-"est affiché au fil du texte sur la page."
+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 ""
+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/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index f7faadb..715ef92 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-12 08:40+0200\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"
 "Language: fr\n"
@@ -19,6 +19,8 @@ msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
 "you can fully customise this site."
 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 ""
@@ -27,6 +29,10 @@ msgid ""
 "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 "

(Diff truncated)
updated PO files
diff --git a/po/underlays/needstranslation.cs.po b/po/underlays/needstranslation.cs.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.cs.po
+++ b/po/underlays/needstranslation.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/needstranslation.da.po b/po/underlays/needstranslation.da.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.da.po
+++ b/po/underlays/needstranslation.da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/needstranslation.de.po b/po/underlays/needstranslation.de.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.de.po
+++ b/po/underlays/needstranslation.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/needstranslation.es.po b/po/underlays/needstranslation.es.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.es.po
+++ b/po/underlays/needstranslation.es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/needstranslation.fr.po b/po/underlays/needstranslation.fr.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.fr.po
+++ b/po/underlays/needstranslation.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##
diff --git a/po/underlays/needstranslation.sv.po b/po/underlays/needstranslation.sv.po
index 2800ec9..bde3478 100644
--- a/po/underlays/needstranslation.sv.po
+++ b/po/underlays/needstranslation.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-22 17:47+0000\n"
+"POT-Creation-Date: 2010-07-22 17:49+0000\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"
@@ -23,7 +23,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-msgid "(This page itself does not need to be translated.)"
+msgid "Note: This page itself does not need to be translated."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Note: The numbers count a page's incoming links, and thus, broadly, its "
+"importance."
 msgstr ""
 
 #. type: Title ##

notes
diff --git a/po/underlays/needstranslation.mdwn b/po/underlays/needstranslation.mdwn
index a5223fd..1243fa3 100644
--- a/po/underlays/needstranslation.mdwn
+++ b/po/underlays/needstranslation.mdwn
@@ -1,7 +1,9 @@
 This page lists pages that are not 100% translated into a language.
 To choose the language, select one of the "translation" links above. 
 
-(This page itself does not need to be translated.)
+Note: This page itself does not need to be translated.
+
+Note: The numbers count a page's incoming links, and thus, broadly, its importance.
 
 ## Full list of all pages needing translation:
 

updated PO files
diff --git a/po/underlays/needstranslation.cs.po b/po/underlays/needstranslation.cs.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.cs.po
+++ b/po/underlays/needstranslation.cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\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"
@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -49,7 +49,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -59,5 +59,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
 msgstr ""
diff --git a/po/underlays/needstranslation.da.po b/po/underlays/needstranslation.da.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.da.po
+++ b/po/underlays/needstranslation.da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\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"
@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -49,7 +49,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -59,5 +59,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
 msgstr ""
diff --git a/po/underlays/needstranslation.de.po b/po/underlays/needstranslation.de.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.de.po
+++ b/po/underlays/needstranslation.de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\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"
@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -49,7 +49,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -59,5 +59,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
 msgstr ""
diff --git a/po/underlays/needstranslation.es.po b/po/underlays/needstranslation.es.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.es.po
+++ b/po/underlays/needstranslation.es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\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"
@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -49,7 +49,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -59,5 +59,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
 msgstr ""
diff --git a/po/underlays/needstranslation.fr.po b/po/underlays/needstranslation.fr.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.fr.po
+++ b/po/underlays/needstranslation.fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\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"
@@ -33,7 +33,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -49,7 +49,7 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)\"]]\n"
 msgstr ""
 
 #. type: Title ##
@@ -59,5 +59,5 @@ msgstr ""
 
 #. type: Plain text
 #, no-wrap
-msgid "[[!map pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
+msgid "[[!pagestats style=table pages=\"(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)\"]]\n"
 msgstr ""
diff --git a/po/underlays/needstranslation.sv.po b/po/underlays/needstranslation.sv.po
index 30391c7..2800ec9 100644
--- a/po/underlays/needstranslation.sv.po
+++ b/po/underlays/needstranslation.sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-20 19:43+0000\n"
+"POT-Creation-Date: 2010-07-22 17:47+0000\n"

(Diff truncated)
map can show parent pages that are 100% translated.. instead, use tables
diff --git a/po/underlays/needstranslation.mdwn b/po/underlays/needstranslation.mdwn
index ba3b961..a5223fd 100644
--- a/po/underlays/needstranslation.mdwn
+++ b/po/underlays/needstranslation.mdwn
@@ -5,14 +5,14 @@ To choose the language, select one of the "translation" links above.
 
 ## Full list of all pages needing translation:
 
-[[!map pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()"]]
+[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation()"]]
 
 ## Pages that are more than 80%, but less than 100% translated:
 
 (Good to work on if you want to maximise the number of fully translated pages.)
 
-[[!map pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)"]]
+[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation() and !needstranslation(80)"]]
 
 ## Pages that are 80% or less translated:
 
-[[!map pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)"]]
+[[!pagestats style=table pages="(smiley/* or directives/* or basewiki/*) and !*/discussion and currentlang() and needstranslation(80)"]]

French update 4
diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po
index 5516a95..2d5e03b 100644
--- a/po/underlays/basewiki/ikiwiki.fr.po
+++ b/po/underlays/basewiki/ikiwiki.fr.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the PACKAGE Ikiwiki.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-30 09:46+0200\n"
+"PO-Revision-Date: 2010-07-21 16:41+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -71,4 +70,4 @@ msgstr "[[ikiwiki/searching]]"
 
 #. type: Bullet: '* '
 msgid "[[templates]]"
-msgstr ""
+msgstr "[[templates]]"
diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
index b95b818..aef5c74 100644
--- a/po/underlays/basewiki/ikiwiki/pagespec.fr.po
+++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2010-07-16 10:47+0200\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"
 "Language: fr\n"
@@ -121,6 +121,32 @@ msgid ""
 "* \"`postcomment(glob)`\" - matches only when comments are being \n"
 "  posted to a page matching the specified glob\n"
 msgstr ""
+"* \"`glob(motif)`\" - recherche les pages et fichiers qui correspondent au motif.\n"
+"  N'écrire que le motif lui-même est un raccourci pour cette fonction.\n"
+"* \"`page(motif)`\" - comme `glob()`, mais ne recherche que des pages, pas des fichiers.\n"
+"* \"`link(page)`\" -  correspond aux pages ayant un lien vers cette page (ou motif)\n"
+"* \"`tagged(étiquette)`\" - correspond aux pages qui sont marquées ou qui sont\n"
+"  liées à l'étiquette donnée (ou des étiquettes correspondant à un motif).\n"
+"* \"`backlink(page)`\" -  correspond seulement aux pages qui sont pointées (lien) par la page donnée.\n"
+"* \"`creation_month(mois)`\" - correspond aux pages créées durant ce mois\n"
+"* \"`creation_day(jour)`\" - ou au jour de ce mois\n"
+"* \"`creation_year(année)`\" - ou année\n"
+"* \"`created_after(page)`\" - correspond aux fichiers créés après la création de la page donnée.\n"
+"* \"`created_before(page)`\\\" - correspond aux fichiers créés avant la création de la page donnée.\n"
+"* \"`internal(motif)`\" - comme `glob()`,  mais correspond en plus aux\n"
+"  pages à usage interne que la fonction glob ne trouve pas en général.\n"
+"* \"`title(motif)`\", \"`author(motif)`\", \"`authorurl(motif)`\",\n"
+"  \"`license(motif)`\", \"`copyright(motif)`\", \"`guid(motif)`\"\n"
+"  -  renvoient les pages qui possèdent les métadonnées correspondant au motif donné.\n"
+"* \"`user(username)`\" - teste si une modification est faite par l'identifiant donné.\n"
+"  Si openid est activé, on peut aussi l'utiliser. L'identifiant peut contenir des expressions régulières.\n"
+"  Par exemple, pour obtenir tous les utilisateurs openid, utilisez l'expression : `user(*://*)`.\n"
+"* \"`admin()`\" - teste si une modification par un administrateur du wiki est en cours.\n"
+"* \"`ip(adresse)`\" - teste si une modification par l'IP donnée est en cours.\n"
+"* \"`comment(motif)`\" - renvoient les commentaires d'une page correspondant au motif donné.\n"
+"* \"`comment_pending(motif)`\" - renvoient les commentaires non modérés, en attente.\n"
+"* \"`postcomment(motif)`\" -  ne correspond que si des commentaires sont postés\n"
+"  vers une page correspondant au motif donné.\n"
 
 #. type: Plain text
 msgid ""
diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po
index 61264b4..5df0b71 100644
--- a/po/underlays/basewiki/ikiwiki/subpage.fr.po
+++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-25 10:31+0200\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"
 "Language: fr\n"
@@ -33,7 +33,6 @@ msgstr ""
 "répertoire plein de pages."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "To add a SubPage, just make a subdirectory and put pages in it. For "
 #| "example, this page is SubPage.mdwn in this wiki's source, and there is "
@@ -44,12 +43,7 @@ msgid ""
 "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/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
index f527ef3..9998bbe 100644
--- a/po/underlays/basewiki/ikiwiki/wikilink.fr.po
+++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-08-28 16:05+0200\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"
 "Language: fr\n"
@@ -76,22 +76,19 @@ msgstr ""
 "quelque chose comme `\\[[WikiLink#foo]]`."
 
 #. type: Plain text
-#, fuzzy
 #| msgid ""
 #| "Also, if the file linked to by a WikiLink looks like an image, it will be "
 #| "displayed inline on the page."
 msgid ""
 "If the file linked to by a WikiLink looks like an image, it will be "
 "displayed inline on the page."
-msgstr ""
-"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il "
-"est affiché au fil du texte sur la page."
+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 ""
+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/templates.fr.po b/po/underlays/basewiki/templates.fr.po
index f7faadb..715ef92 100644
--- a/po/underlays/basewiki/templates.fr.po
+++ b/po/underlays/basewiki/templates.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 22:29+0000\n"
-"PO-Revision-Date: 2009-09-12 08:40+0200\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"
 "Language: fr\n"
@@ -19,6 +19,8 @@ msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
 "you can fully customise this site."
 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 ""
@@ -27,6 +29,10 @@ msgid ""
 "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 ""
@@ -34,19 +40,20 @@ msgid ""
 "things like conditionals and loops in templates and is pretty easy to learn. "
 "All you really need to know to modify templates is this:"
 msgstr ""
+"Ikiwiki utilise le module HTML::Template pour créer ses modèles. Ce module, "
+"facile à étudier, permet l'utilisation de conditions et de boucles. Voici ce "
+"que vous avez besoin de savoir :"
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "To insert the raw value of a variable, with wiki markup not yet converted "
 #| "to html, use `<TMPL_VAR raw_variable>`."
 msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
 msgstr ""
-"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit "
-"convertie en html, utilisez `<TMPL_VAR raw_variable>`."
+"Pour insérer la valeur d'une variable, sans que la syntaxe wiki soit "
+"convertie en HTML, utilisez `<TMPL_VAR variable>`."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "To make a block of text conditional on a variable being set use `<TMPL_IF "

(Diff truncated)
unfuzzy calendar
diff --git a/po/underlays/directives/ikiwiki/directive/calendar.fr.po b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
index 20a3212..0ec4e7f 100644
--- a/po/underlays/directives/ikiwiki/directive/calendar.fr.po
+++ b/po/underlays/directives/ikiwiki/directive/calendar.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "POT-Creation-Date: 2010-07-18 19:05-0300\n"
-"PO-Revision-Date: 2010-07-20 17:03+0200\n"
+"PO-Revision-Date: 2010-07-20 21:54+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -128,7 +128,6 @@ msgstr ""
 "seront liées au calendrier. La valeur par défaut est « * »."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`archivebase` - Configures the base of the archives hierarchy. The "
 #| "default is \"archives\". Note that this default can also be overridden "
@@ -142,7 +141,6 @@ msgid ""
 msgstr "`archivebase` - Indique la racine des répertoires d'archives, « archives » par défaut. On peut changer cette valeur en renseignant `archivebase` dans le fichier de configuration d'ikiwiki. Les calendriers se lient à des pages placées là, nommées \"2010/04\" ou \"2010\" par exemple. Ces pages peuvent être créées automatiquement par le programme `ikiwiki-calendar`."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`year` - The year for which the calendar is requested. Defaults to the "
 #| "current year."
@@ -152,7 +150,6 @@ msgid ""
 msgstr "`year` - Indique l'année pour le calendrier annuel. La valeur par défaut est l'année en cours. On peut aussi utiliser -1 pour se référer à l'année dernière, ainsi de suite."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`month` - The numeric month for which the calendar is requested, in the "
 #| "range 1..12. Used only for the month view calendar, and defaults to the "
@@ -174,7 +171,6 @@ msgstr ""
 "etc. La valeur par défaut est 0, dimanche."
 
 #. type: Bullet: '* '
-#, fuzzy
 #| msgid ""
 #| "`months_per_row` - In the annual calendar, number of months to place in "
 #| "each row. Defaults to 3."