Merge branch 'master' into _nb

1 files changed, 834 insertions, 363 deletions

diff --git a/po/templates.pot b/po/templates.pot
index 2676365..49a13ff 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ikiwiki templates 2.62.1\n"
-"POT-Creation-Date: 2008-10-23 13:26+0300\n"
+"Project-Id-Version: ikiwiki templates 3.20100704\n"
+"POT-Creation-Date: 2010-07-16 13:42+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"
@@ -15,153 +15,169 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:3
 #, no-wrap
 msgid ""
 "<TMPL_VAR CONTENT>\n"
-"<TMPL_LOOP NAME=\"TAGS\">\n"
+"<TMPL_LOOP TAGS>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:3
 #, no-wrap
 msgid "[[!tag <TMPL_VAR TAG>]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:6
 #, no-wrap
 msgid ""
 "</TMPL_LOOP>\n"
-"<TMPL_IF NAME=\"TITLE\">\n"
+"<TMPL_IF TITLE>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:6
 #, no-wrap
-msgid "[[!meta title=\"<TMPL_VAR NAME=\"TITLE\" ESCAPE=HTML>\"]]\n"
+msgid "[[!meta title=\"<TMPL_VAR TITLE ESCAPE=HTML>\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:9
 #, no-wrap
 msgid ""
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"PERMALINK\">\n"
+"<TMPL_IF PERMALINK>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:9
 #, no-wrap
-msgid "[[!meta permalink=\"<TMPL_VAR NAME=\"PERMALINK\" ESCAPE=HTML>\"]]\n"
+msgid "[[!meta permalink=\"<TMPL_VAR PERMALINK ESCAPE=HTML>\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:12
 #, no-wrap
 msgid ""
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"COPYRIGHT\">\n"
+"<TMPL_IF COPYRIGHT>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:12
 #, no-wrap
-msgid "[[!meta copyright=\"<TMPL_VAR NAME=\"COPYRIGHT\" ESCAPE=HTML>\"]]\n"
+msgid "[[!meta copyright=\"<TMPL_VAR COPYRIGHT ESCAPE=HTML>\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:14 change.tmpl:5
 #, no-wrap
 msgid "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:14
 #, no-wrap
-msgid "[[!meta author=\"<TMPL_VAR NAME=\"NAME\" ESCAPE=HTML>\"]]\n"
+msgid "[[!meta author=\"<TMPL_VAR NAME ESCAPE=HTML>\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: aggregatepost.tmpl:15
 #, no-wrap
-msgid "[[!meta authorurl=\"<TMPL_VAR NAME=\"URL\" ESCAPE=HTML>\"]]\n"
+msgid "[[!meta authorurl=\"<TMPL_VAR URL ESCAPE=HTML>\"]]\n"
 msgstr ""
 
-# type: Plain text
-#: archivepage.tmpl:6
+#. type: Plain text
+#: archivepage.tmpl:19
 #, no-wrap
 msgid ""
 "<p>\n"
+"<TMPL_IF PERMALINK>\n"
+"<a href=\"<TMPL_VAR PERMALINK>\"><TMPL_VAR TITLE></a><br />\n"
+"<TMPL_ELSE>\n"
 "<a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a><br />\n"
+"</TMPL_IF>\n"
 "<i>\n"
 "Posted <TMPL_VAR CTIME>\n"
+"<TMPL_IF AUTHOR>\n"
+"by <span class=\"author\">\n"
+"<TMPL_IF AUTHORURL>\n"
+"<a href=\"<TMPL_VAR AUTHORURL>\"><TMPL_VAR AUTHOR></a>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_VAR AUTHOR>\n"
+"</TMPL_IF>\n"
+"</span>\n"
+"</TMPL_IF>\n"
 "</i>\n"
+"</p>\n"
 msgstr ""
 
-# type: Plain text
-#: archivepage.tmpl:7
-#, no-wrap
-msgid "</p>\n"
-msgstr ""
-
-# type: Plain text
-#: atomitem.tmpl:42
+#. type: Plain text
+#: atomitem.tmpl:48
 #, no-wrap
 msgid ""
 "<entry>\n"
 "\t<title><TMPL_VAR TITLE></title>\n"
-"\t<TMPL_IF NAME=\"GUID\">\n"
-"\t  <id><TMPL_VAR GUID></id>\n"
-"\t<TMPL_ELSE>\n"
-"\t  <id><TMPL_VAR URL></id>\n"
-"\t</TMPL_IF>\n"
+"<TMPL_IF GUID>\n"
+"\t<id><TMPL_VAR GUID></id>\n"
+"<TMPL_ELSE>\n"
+"\t<id><TMPL_VAR URL></id>\n"
+"</TMPL_IF>\n"
 "\t<link href=\"<TMPL_VAR PERMALINK>\"/>\n"
-"\t<TMPL_IF NAME=\"AUTHOR\">\n"
-"\t <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>\n"
-"\t</TMPL_IF>\n"
-"\t<TMPL_IF NAME=\"COPYRIGHT\">\n"
-"\t <rights type=\"html\" xml:lang=\"en\">\n"
-"\t   <TMPL_IF NAME=\"LICENSE\">\n"
-"\t    <TMPL_VAR LICENSE ESCAPE=HTML>\n"
-"\t    <TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
-"\t   <TMPL_ELSE>\n"
-"\t    <TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
-"\t   </TMPL_IF>\n"
-"\t </rights>\n"
-"\t<TMPL_ELSE>\n"
-"\t <TMPL_IF NAME=\"LICENSE\">\n"
-"\t  <rights type=\"html\" xml:lang=\"en\">\n"
-"\t    <TMPL_VAR LICENSE ESCAPE=HTML>\n"
-"\t  </rights>\n"
-"\t </TMPL_IF>\n"
-"\t</TMPL_IF>\n"
-"\t<TMPL_IF NAME=\"CATEGORIES\">\n"
-"\t <TMPL_LOOP NAME=\"CATEGORIES\">\n"
-"\t  <category term=\"<TMPL_VAR CATEGORY>\" />\n"
-"\t </TMPL_LOOP>\n"
-"\t</TMPL_IF>\n"
+"<TMPL_IF AUTHOR>\n"
+"\t<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF COPYRIGHT>\n"
+"\t<rights type=\"html\" xml:lang=\"en\">\n"
+"<TMPL_IF LICENSE>\n"
+"\t\t<TMPL_VAR LICENSE ESCAPE=HTML>\n"
+"\t\t<TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
+"<TMPL_ELSE>\n"
+"\t\t<TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
+"</TMPL_IF>\n"
+"\t</rights>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_IF LICENSE>\n"
+"\t<rights type=\"html\" xml:lang=\"en\">\n"
+"\t<TMPL_VAR LICENSE ESCAPE=HTML>\n"
+"\t</rights>\n"
+"</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF CATEGORIES>\n"
+"<TMPL_LOOP CATEGORIES>\n"
+"\t<category term=\"<TMPL_VAR CATEGORY>\" />\n"
+"</TMPL_LOOP>\n"
+"</TMPL_IF>\n"
 "\t<updated><TMPL_VAR MDATE_3339></updated>\n"
 "\t<published><TMPL_VAR CDATE_3339></published>\n"
-"\t<TMPL_IF NAME=\"ENCLOSURE\">\n"
-"\t <link rel=\"enclosure\" type=\"<TMPL_VAR TYPE>\" href=\"<TMPL_VAR "
+"<TMPL_IF ENCLOSURE>\n"
+"\t<link rel=\"enclosure\" type=\"<TMPL_VAR TYPE>\" href=\"<TMPL_VAR "
 "ENCLOSURE>\" length=\"<TMPL_VAR LENGTH>\" />\n"
-"\t<TMPL_ELSE>\n"
-"\t <content type=\"html\" xml:lang=\"en\">\n"
-"\t  <TMPL_VAR CONTENT ESCAPE=HTML>\n"
-"\t </content>\n"
-"\t</TMPL_IF>\n"
+"<TMPL_ELSE>\n"
+"\t<content type=\"html\" xml:lang=\"en\">\n"
+"\t<TMPL_VAR CONTENT ESCAPE=HTML>\n"
+"\t</content>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF COMMENTSURL>\n"
+"\t<link rel=\"comments\" href=\"<TMPL_VAR COMMENTSURL>\" type=\"text/html\" "
+"/>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF ATOMCOMMENTSURL>\n"
+"\t<link rel=\"comments\" href=\"<TMPL_VAR ATOMCOMMENTSURL>\" "
+"type=\"application/atom+xml\" />\n"
+"</TMPL_IF>\n"
 "</entry>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: atompage.tmpl:2
 #, no-wrap
 msgid "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: atompage.tmpl:39
 #, no-wrap
 msgid ""
@@ -171,32 +187,32 @@ msgid ""
 "<link href=\"<TMPL_VAR FEEDURL>\" rel=\"self\" "
 "type=\"application/atom+xml\"/>\n"
 "<author>\n"
-"<TMPL_IF NAME=\"AUTHOR\">\n"
-" <name><TMPL_VAR AUTHOR></name>\n"
+"<TMPL_IF AUTHOR>\n"
+"<name><TMPL_VAR AUTHOR></name>\n"
 "<TMPL_ELSE>\n"
-" <name><TMPL_VAR WIKINAME></name>\n"
+"<name><TMPL_VAR WIKINAME></name>\n"
 "</TMPL_IF>\n"
 "</author>\n"
-"<TMPL_IF NAME=\"COPYRIGHT\">\n"
-" <rights type=\"html\" xml:lang=\"en\">\n"
-"   <TMPL_IF NAME=\"LICENSE\">\n"
-"    <TMPL_VAR LICENSE>\n"
-"    <TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
-"   <TMPL_ELSE>\n"
-"    <TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
-"   </TMPL_IF>\n"
-" </rights>\n"
+"<TMPL_IF COPYRIGHT>\n"
+"<rights type=\"html\" xml:lang=\"en\">\n"
+"<TMPL_IF LICENSE>\n"
+"\t<TMPL_VAR LICENSE>\n"
+"\t<TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
 "<TMPL_ELSE>\n"
-" <TMPL_IF NAME=\"LICENSE\">\n"
-"  <rights type=\"html\">\n"
-"    <TMPL_VAR LICENSE ESCAPE=HTML>\n"
-"  </rights>\n"
-" </TMPL_IF>\n"
-"</TMPL_IF>\n"
-"<TMPL_IF NAME=\"GUID\">\n"
-"  <id><TMPL_VAR GUID></id>\n"
+"\t<TMPL_VAR COPYRIGHT ESCAPE=HTML>\n"
+"</TMPL_IF>\n"
+"</rights>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_IF LICENSE>\n"
+"<rights type=\"html\">\n"
+"\t<TMPL_VAR LICENSE ESCAPE=HTML>\n"
+"</rights>\n"
+"</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF GUID>\n"
+"<id><TMPL_VAR GUID></id>\n"
 "<TMPL_ELSE>\n"
-"  <id><TMPL_VAR PAGEURL></id>\n"
+"<id><TMPL_VAR PAGEURL></id>\n"
 "</TMPL_IF>\n"
 "<subtitle type=\"html\"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>\n"
 "<generator uri=\"http://ikiwiki.info/\" version=\"<TMPL_VAR "
@@ -206,25 +222,39 @@ msgid ""
 "</feed>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: autoindex.tmpl:1
 #, no-wrap
 msgid "[[!map pages=\"<TMPL_VAR PAGE>/* and ! <TMPL_VAR PAGE>/*/*\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: autotag.tmpl:1
+#, no-wrap
+msgid "[[!meta title=\"pages tagged <TMPL_VAR TAGNAME>\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: autotag.tmpl:4
+#, no-wrap
+msgid ""
+"[[!inline pages=\"tagged(<TMPL_VAR TAG>)\" actions=\"no\" archive=\"yes\"\n"
+"feedshow=10]]\n"
+msgstr ""
+
+#. type: Plain text
 #: blogpost.tmpl:16
 #, no-wrap
 msgid ""
 "<form action=\"<TMPL_VAR CGIURL>\" method=\"get\">\n"
 "<div id=\"blogform\">\n"
-"<TMPL_IF NAME=\"RSSURL\">\n"
+"<TMPL_IF RSSURL>\n"
 "<a class=\"feedbutton\" type=\"application/rss+xml\" href=\"<TMPL_VAR "
-"NAME=RSSURL>\">RSS</a>\n"
+"RSSURL>\">RSS</a>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"ATOMURL\">\n"
+"<TMPL_IF ATOMURL>\n"
 "<a class=\"feedbutton\" type=\"application/atom+xml\" href=\"<TMPL_VAR "
-"NAME=ATOMURL>\">Atom</a>\n"
+"ATOMURL>\">Atom</a>\n"
 "</TMPL_IF>\n"
 "<input type=\"hidden\" name=\"do\" value=\"blog\" />\n"
 "<input type=\"hidden\" name=\"from\" value=\"<TMPL_VAR ROOTPAGE>\" />\n"
@@ -236,41 +266,83 @@ msgid ""
 "</form>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: calendarmonth.tmpl:1
+#, no-wrap
+msgid "[[!sidebar content=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: calendarmonth.tmpl:2
+#, no-wrap
+msgid ""
+"[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> "
+"pages=\"<TMPL_VAR PAGESPEC>\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: calendarmonth.tmpl:5
+#, no-wrap
+msgid ""
+"[[!inline pages=\"creation_month(<TMPL_VAR MONTH>) and "
+"creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>\" show=0 feeds=no "
+"reverse=yes]]\n"
+msgstr ""
+
+#. type: Plain text
+#: calendaryear.tmpl:1
+#, no-wrap
+msgid "[[!calendar type=year year=<TMPL_VAR YEAR> pages=\"<TMPL_VAR PAGESPEC>\"]]\n"
+msgstr ""
+
+#. type: Plain text
 #: change.tmpl:1
 #, no-wrap
 msgid "[[!meta author=\"\"\"<TMPL_VAR AUTHOR>\"\"\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: change.tmpl:3
 #, no-wrap
 msgid "<TMPL_IF AUTHORURL>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: change.tmpl:3
 #, no-wrap
 msgid "[[!meta authorurl=\"\"\"<TMPL_VAR AUTHORURL>\"\"\"]]\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: change.tmpl:5
 #, no-wrap
 msgid ""
-"[[!meta title=\"\"\"change to<TMPL_LOOP NAME=\"PAGES\"> <TMPL_VAR "
-"PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>\"\"\"]]\n"
+"[[!meta title=\"\"\"change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> "
+"on <TMPL_VAR WIKINAME>\"\"\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: change.tmpl:7
+#, no-wrap
+msgid "<TMPL_IF PERMALINK>\n"
 msgstr ""
 
-# type: Plain text
-#: change.tmpl:43
+#. type: Plain text
+#: change.tmpl:7
+#, no-wrap
+msgid "[[!meta permalink=\"<TMPL_VAR PERMALINK>\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: change.tmpl:46
 #, no-wrap
 msgid ""
-"<div class=\"metadata\">\n"
+"</TMPL_IF>\n"
+"<div id=\"change-<TMPL_VAR REV>\" class=\"metadata\">\n"
 "<span class=\"desc\"><br />Changed pages:</span>\n"
 "<span class=\"pagelinks\">\n"
-"<TMPL_LOOP NAME=\"PAGES\">\n"
-"<TMPL_IF NAME=\"DIFFURL\"><a href=\"<TMPL_VAR "
+"<TMPL_LOOP PAGES>\n"
+"<TMPL_IF DIFFURL><a href=\"<TMPL_VAR "
 "DIFFURL>\">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>\n"
 "<TMPL_ELSE>\n"
 "<TMPL_VAR LINK>\n"
@@ -279,8 +351,8 @@ msgid ""
 "</span>\n"
 "<span class=\"desc\"><br />Changed by:</span>\n"
 "<span class=\"committer\">\n"
-"<TMPL_IF NAME=\"AUTHORURL\">\n"
-"<a href=\"<TMPL_VAR AUTHORURL>\"><TMPL_VAR USER></a>\n"
+"<TMPL_IF AUTHORURL>\n"
+"<a href=\"<TMPL_VAR AUTHORURL>\" rel=\"nofollow\"><TMPL_VAR USER></a>\n"
 "<TMPL_ELSE>\n"
 "<TMPL_VAR USER>\n"
 "</TMPL_IF>\n"
@@ -290,24 +362,222 @@ msgid ""
 "<span class=\"desc\"><br />Date:</span>\n"
 "<span class=\"changedate\"><TMPL_VAR COMMITDATE></span>\n"
 "</div>\n"
-"<div class=changelog>\n"
-"<TMPL_LOOP NAME=\"MESSAGE\">\n"
-"<TMPL_IF NAME=\"LINE\">\n"
-"<TMPL_VAR NAME=\"LINE\" ESCAPE=\"HTML\"><br />\n"
+"<div class=\"changelog\">\n"
+"<TMPL_LOOP MESSAGE>\n"
+"<TMPL_IF LINE>\n"
+"<TMPL_VAR LINE><br />\n"
 "</TMPL_IF>\n"
 "</TMPL_LOOP>\n"
 "</div>\n"
-"<TMPL_IF NAME=\"DIFF\">\n"
-"<div class=diff>\n"
+"<TMPL_IF DIFF>\n"
+"<div class=\"diff\">\n"
 "<pre>\n"
-"<TMPL_VAR NAME=\"DIFF\" ESCAPE=\"HTML\">\n"
+"<TMPL_VAR DIFF>\n"
 "</pre>\n"
 "</div>\n"
 "</TMPL_IF>\n"
 "<!-- <TMPL_VAR REV> -->\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: comment.tmpl:3
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><article class=\"comment\" id=\"<TMPL_VAR COMMENTID>\">\n"
+"<TMPL_ELSE><div class=\"comment\" id=\"<TMPL_VAR COMMENTID>\"></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: comment.tmpl:11
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><header class=\"comment-subject\"><TMPL_ELSE><div "
+"class=\"comment-subject\"></TMPL_IF>\n"
+"<TMPL_IF PERMALINK>\n"
+"<a href=\"<TMPL_VAR PERMALINK>\"><TMPL_VAR TITLE></a>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_VAR TITLE>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: comment.tmpl:15 inlinepage.tmpl:25
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><section class=\"inlinecontent\"><TMPL_ELSE><div "
+"class=\"inlinecontent\"></TMPL_IF>\n"
+"<TMPL_VAR CONTENT>\n"
+"<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: comment.tmpl:50
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><header class=\"comment-header\"><TMPL_ELSE><div "
+"class=\"comment-header\"></TMPL_IF>\n"
+"<TMPL_IF COMMENTUSER>\n"
+"Comment by\n"
+"<TMPL_IF COMMENTOPENID>\n"
+"<span class=\"author\" title=\"OpenID\">\n"
+"<a href=\"<TMPL_VAR COMMENTOPENID>\"><TMPL_VAR COMMENTAUTHOR></a>\n"
+"</span>\n"
+"<TMPL_ELSE>\n"
+"<span class=\"author\" title=\"Signed in\">\n"
+"<TMPL_IF COMMENTAUTHORURL>\n"
+"<a href=\"<TMPL_VAR COMMENTAUTHORURL>\"><TMPL_VAR COMMENTAUTHOR></a>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_VAR COMMENTAUTHOR>\n"
+"</TMPL_IF>\n"
+"</span>\n"
+"</TMPL_IF>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_IF AUTHOR>\n"
+"Comment by\n"
+"<TMPL_IF COMMENTIP>\n"
+"<span class=\"author\" title=\"Unauthenticated, from <TMPL_VAR "
+"COMMENTIP>\">\n"
+"<TMPL_ELSE>\n"
+"<span class=\"author\" title=\"Unauthenticated, from unknown IP address\">\n"
+"</TMPL_IF>\n"
+"<TMPL_IF AUTHORURL>\n"
+"<a href=\"<TMPL_VAR AUTHORURL>\"><TMPL_VAR AUTHOR></a>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_VAR AUTHOR>\n"
+"</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"</span>\n"
+"</TMPL_IF>\n"
+"&mdash; <TMPL_VAR CTIME>\n"
+"<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: comment.tmpl:60
+#, no-wrap
+msgid ""
+"<TMPL_IF HAVE_ACTIONS>\n"
+"<TMPL_IF HTML5><nav class=\"actions\"><TMPL_ELSE><div "
+"class=\"actions\"></TMPL_IF>\n"
+"<ul>\n"
+"<TMPL_IF REMOVEURL>\n"
+"<li><a href=\"<TMPL_VAR REMOVEURL>\" rel=\"nofollow\">Remove "
+"comment</a></li>\n"
+"</TMPL_IF>\n"
+"</ul>\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
+"</TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: comment.tmpl:61 inlinepage.tmpl:72 page.tmpl:193
+#, no-wrap
+msgid "<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: commentmoderation.tmpl:32
+#, no-wrap
+msgid ""
+"<TMPL_IF COMMENTS>\n"
+"<br />\n"
+"<form action=\"<TMPL_VAR CGIURL>\" method=\"post\">\n"
+"<input type=\"hidden\" name=\"do\" value=\"commentmoderation\" />\n"
+"<input type=\"hidden\" name=\"sid\" value=\"<TMPL_VAR SID>\" />\n"
+"<input type=\"submit\" value=\"Submit\" />\n"
+"<input id=\"rejectalldefer\" type=\"checkbox\" name=\"rejectalldefer\" "
+"value=\"1\" />\n"
+"<label for=\"rejectalldefer\">Reject all comments marked "
+"<em>Defer</em></label>\n"
+"<br />\n"
+"<TMPL_LOOP COMMENTS>\n"
+"<div>\n"
+"<div>\n"
+"<TMPL_VAR VIEW>\n"
+"</div>\n"
+"<input id=\"defer_<TMPL_VAR ID>\" type=\"radio\" value=\"Defer\" "
+"name=\"<TMPL_VAR ID>\" checked=\"checked\" />\n"
+"<label for=\"defer_<TMPL_VAR ID>\">Defer</label>\n"
+"<input id=\"dccept_<TMPL_VAR ID>\" type=\"radio\" value=\"Accept\" "
+"name=\"<TMPL_VAR ID>\" />\n"
+"<label for=\"dccept_<TMPL_VAR ID>\">Accept</label>\n"
+"<input id=\"reject_<TMPL_VAR ID>\" type=\"radio\" value=\"Reject\" "
+"name=\"<TMPL_VAR ID>\" />\n"
+"<label for=\"reject_<TMPL_VAR ID>\">Reject</label>\n"
+"</div>\n"
+"<br />\n"
+"</TMPL_LOOP>\n"
+"<input type=\"submit\" value=\"Submit\" />\n"
+"<input id=\"rejectalldefer2\" type=\"checkbox\" name=\"rejectalldefer\" "
+"value=\"1\" />\n"
+"<label for=\"rejectalldefer2\">Reject all comments marked "
+"<em>Defer</em></label>\n"
+"</form>\n"
+"<TMPL_ELSE>\n"
+"<p>\n"
+"No comments need moderation at this time.\n"
+"</p>\n"
+"</TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: editcomment.tmpl:28
+#, no-wrap
+msgid ""
+"<div class=\"editcomment\">\n"
+"<TMPL_VAR MESSAGE>\n"
+"<br />\n"
+"<TMPL_VAR FORM-START>\n"
+"<TMPL_VAR FIELD-DO>\n"
+"<TMPL_VAR FIELD-SID>\n"
+"<TMPL_VAR FIELD-PAGE>\n"
+"<TMPL_UNLESS NAME=USERNAME>\n"
+"<TMPL_IF NAME=ALLOWAUTHOR>\n"
+"<label for=\"author\" class=\"block\">Name:</label>\n"
+"<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href=\"<TMPL_VAR "
+"SIGNINURL>\">signin</a>)\n"
+"<br/>\n"
+"<label for=\"url\" class=\"block\">Website:</label>\n"
+"<TMPL_VAR NAME=FIELD-URL> (optional)\n"
+"<br />\n"
+"<TMPL_ELSE>\n"
+"(You might want to <a href=\"<TMPL_VAR SIGNINURL>\">Signin</a> first?)\n"
+"<br />\n"
+"</TMPL_IF>\n"
+"</TMPL_UNLESS>\n"
+"<label for=\"subject\" class=\"block\">Subject:</label>\n"
+"<TMPL_VAR FIELD-SUBJECT><br />\n"
+"<label for=\"editcontent\" class=\"block\">Comment:</label>\n"
+"<TMPL_VAR FIELD-EDITCONTENT><br />\n"
+"<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR "
+"HELPONFORMATTINGLINK><br />\n"
+"<TMPL_VAR NAME=\"FORM-END\">\n"
+"<TMPL_VAR WMD_PREVIEW>\n"
+msgstr ""
+
+#. type: Plain text
+#: editcomment.tmpl:38
+#, no-wrap
+msgid ""
+"<TMPL_IF NAME=\"PAGE_PREVIEW\">\n"
+"<hr />\n"
+"<div class=\"header\">\n"
+"<span>Comment preview:</span>\n"
+"</div><!-- .header -->\n"
+"<div id=\"preview\">\n"
+"<TMPL_VAR PAGE_PREVIEW>\n"
+"</div><!-- #preview -->\n"
+"</TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: editcomment.tmpl:39
+#, no-wrap
+msgid "</div><!-- .editcomment -->\n"
+msgstr ""
+
+#. type: Plain text
 #: editconflict.tmpl:7
 #, no-wrap
 msgid ""
@@ -320,7 +590,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: editcreationconflict.tmpl:9
 #, no-wrap
 msgid ""
@@ -336,7 +606,7 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: editfailedsave.tmpl:10
 #, no-wrap
 msgid ""
@@ -352,13 +622,13 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-# type: Plain text
-#: editpage.tmpl:40
+#. type: Plain text
+#: editpage.tmpl:42
 #, no-wrap
 msgid ""
-"<br />\n"
 "<TMPL_VAR JAVASCRIPT>\n"
 "<TMPL_VAR MESSAGE>\n"
+"<br />\n"
 "<TMPL_VAR FORM-START>\n"
 "<TMPL_VAR FIELD-DO>\n"
 "<TMPL_VAR FIELD-SID>\n"
@@ -366,17 +636,21 @@ msgid ""
 "<TMPL_VAR FIELD-RCSINFO>\n"
 "<TMPL_VAR FIELD-NEWFILE>\n"
 "<TMPL_IF NAME=\"PAGE_SELECT\">\n"
-"Page location: <TMPL_VAR FIELD-PAGE>\n"
-"Page type: <TMPL_VAR FIELD-TYPE>\n"
+"<label for=\"page\" class=\"inline\">Page location:</label><TMPL_VAR "
+"FIELD-PAGE>\n"
+"<label for=\"type\" class=\"inline\">Page type:</label><TMPL_VAR "
+"FIELD-TYPE>\n"
 "<TMPL_ELSE>\n"
-"<br />\n"
 "<TMPL_VAR FIELD-PAGE>\n"
 "<TMPL_VAR FIELD-TYPE>\n"
 "</TMPL_IF>\n"
+"<div class=\"editcontentdiv\">\n"
 "<TMPL_VAR FIELD-EDITCONTENT><br />\n"
+"</div>\n"
 "<TMPL_IF NAME=\"CAN_COMMIT\">\n"
-"Optional comment about this change:<br />\n"
-"<TMPL_VAR FIELD-COMMENTS><br />\n"
+"<label for=\"editmessage\" class=\"block\">Optional comment about this "
+"change:</label>\n"
+"<TMPL_VAR FIELD-EDITMESSAGE><br />\n"
 "</TMPL_IF>\n"
 "<TMPL_VAR FORM-SUBMIT>\n"
 "<TMPL_VAR HELPONFORMATTINGLINK>\n"
@@ -398,10 +672,11 @@ msgid ""
 "</div>\n"
 "</TMPL_IF>\n"
 "<TMPL_VAR FORM-END>\n"
+"<TMPL_VAR WMD_PREVIEW>\n"
 msgstr ""
 
-# type: Plain text
-#: editpage.tmpl:49
+#. type: Plain text
+#: editpage.tmpl:60
 #, no-wrap
 msgid ""
 "<TMPL_IF NAME=\"PAGE_PREVIEW\">\n"
@@ -413,9 +688,18 @@ msgid ""
 "<TMPL_VAR PAGE_PREVIEW>\n"
 "</div>\n"
 "</TMPL_IF>\n"
+"<TMPL_IF NAME=\"PAGE_DIFF\">\n"
+"<hr />\n"
+"<div class=\"header\">\n"
+"<span>Diff:</span>\n"
+"</div>\n"
+"<div id=\"diff\">\n"
+"<TMPL_VAR PAGE_DIFF>\n"
+"</div>\n"
+"</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: editpagegone.tmpl:7
 #, no-wrap
 msgid ""
@@ -428,94 +712,81 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: feedlink.tmpl:8
 #, no-wrap
 msgid ""
 "<div id=\"feedlink\">\n"
-"<TMPL_IF NAME=\"RSSURL\">\n"
+"<TMPL_IF RSSURL>\n"
 "<a class=\"feedbutton\" type=\"application/rss+xml\" href=\"<TMPL_VAR "
-"NAME=RSSURL>\">RSS</a>\n"
+"RSSURL>\">RSS</a>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"ATOMURL\">\n"
+"<TMPL_IF ATOMURL>\n"
 "<a class=\"feedbutton\" type=\"application/atom+xml\" href=\"<TMPL_VAR "
-"NAME=ATOMURL>\">Atom</a>\n"
+"ATOMURL>\">Atom</a>\n"
 "</TMPL_IF>\n"
 "</div>\n"
 msgstr ""
 
-# type: Plain text
-#: googleform.tmpl:6
+#. type: Plain text
+#: googleform.tmpl:8
 #, no-wrap
 msgid ""
 "<form method=\"get\" action=\"http://www.google.com/search\" "
 "id=\"searchform\">\n"
 " <div>\n"
-"  <input name=\"sitesearch\" value=\"<TMPL_VAR SITEFQDN>\" "
-"type=\"hidden\">\n"
+"  <input name=\"sitesearch\" value=\"<TMPL_VAR URL>\" type=\"hidden\" />\n"
 "  <input name=\"q\" value=\"\" id=\"searchbox\" size=\"16\" "
-"maxlength=\"255\" type=\"text\">\n"
+"maxlength=\"255\" type=\"text\"\n"
+"  <TMPL_IF HTML5>placeholder=\"search\"</TMPL_IF> />\n"
 " </div>\n"
 "</form>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: inlinepage.tmpl:2
 #, no-wrap
-msgid "<div class=\"inlinepage\">\n"
-msgstr ""
-
-# type: Plain text
-#: inlinepage.tmpl:4
-#, no-wrap
-msgid "<div class=\"inlineheader\">\n"
+msgid ""
+"<TMPL_IF HTML5><article class=\"inlinepage\"><TMPL_ELSE><div "
+"class=\"inlinepage\"></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: inlinepage.tmpl:21
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"AUTHOR\">\n"
+"<TMPL_IF HTML5><section class=\"inlineheader\"><TMPL_ELSE><div "
+"class=\"inlineheader\"></TMPL_IF>\n"
+"<TMPL_IF AUTHOR>\n"
 "<span class=\"author\">\n"
-"<TMPL_IF NAME=\"AUTHORURL\">\n"
-"<a href=\"<TMPL_VAR NAME=AUTHORURL>\"><TMPL_VAR NAME=AUTHOR></a>\n"
+"<TMPL_IF AUTHORURL>\n"
+"<a href=\"<TMPL_VAR AUTHORURL>\"><TMPL_VAR AUTHOR></a>\n"
 "<TMPL_ELSE>\n"
-"<TMPL_VAR NAME=AUTHOR>\n"
+"<TMPL_VAR AUTHOR>\n"
 "</TMPL_IF>\n"
 "</span>\n"
 "</TMPL_IF>\n"
-"<span class=\"header\">\n"
-"<TMPL_IF NAME=\"PERMALINK\">\n"
+"<TMPL_IF HTML5><header class=\"header\"><TMPL_ELSE><span "
+"class=\"header\"></TMPL_IF>\n"
+"<TMPL_IF PERMALINK>\n"
 "<a href=\"<TMPL_VAR PERMALINK>\"><TMPL_VAR TITLE></a>\n"
 "<TMPL_ELSE>\n"
 "<a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a>\n"
 "</TMPL_IF>\n"
-"</span>\n"
-msgstr ""
-
-# type: Plain text
-#: inlinepage.tmpl:23
-#, no-wrap
-msgid "</div><!--.inlineheader-->\n"
+"<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>\n"
+"<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: inlinepage.tmpl:27
 #, no-wrap
 msgid ""
-"<div class=\"inlinecontent\">\n"
-"<TMPL_VAR CONTENT>\n"
-"</div><!--.inlinecontent-->\n"
+"<TMPL_IF HTML5><footer class=\"inlinefooter\"><TMPL_ELSE><div "
+"class=\"inlinefooter\"></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:29
-#, no-wrap
-msgid "<div class=\"inlinefooter\">\n"
-msgstr ""
-
-# type: Plain text
-#: inlinepage.tmpl:33
+#. type: Plain text
+#: inlinepage.tmpl:31
 #, no-wrap
 msgid ""
 "<span class=\"pagedate\">\n"
@@ -523,22 +794,23 @@ msgid ""
 "</span>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:42
+#. type: Plain text
+#: inlinepage.tmpl:40
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"TAGS\">\n"
-"<span class=\"tags\">\n"
+"<TMPL_IF TAGS>\n"
+"<TMPL_IF HTML5><nav class=\"tags\"><TMPL_ELSE><span "
+"class=\"tags\"></TMPL_IF>\n"
 "Tags:\n"
-"<TMPL_LOOP NAME=\"TAGS\">\n"
-"<TMPL_VAR NAME=LINK>\n"
+"<TMPL_LOOP TAGS>\n"
+"<TMPL_VAR LINK>\n"
 "</TMPL_LOOP>\n"
-"</span>\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>\n"
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:48
+#. type: Plain text
+#: inlinepage.tmpl:46
 #, no-wrap
 msgid ""
 "<TMPL_IF COPYRIGHT>\n"
@@ -548,8 +820,8 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:54
+#. type: Plain text
+#: inlinepage.tmpl:52
 #, no-wrap
 msgid ""
 "<TMPL_IF LICENSE>\n"
@@ -559,245 +831,414 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:67
+#. type: Plain text
+#: inlinepage.tmpl:69
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"HAVE_ACTIONS\">\n"
-"<div class=\"actions\">\n"
+"<TMPL_IF HAVE_ACTIONS>\n"
+"<TMPL_IF HTML5><nav class=\"actions\"><TMPL_ELSE><div "
+"class=\"actions\"></TMPL_IF>\n"
 "<ul>\n"
-"<TMPL_IF NAME=\"EDITURL\">\n"
+"<TMPL_IF EDITURL>\n"
 "<li><a href=\"<TMPL_VAR EDITURL>\" rel=\"nofollow\">Edit</a></li>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"DISCUSSIONLINK\">\n"
+"<TMPL_IF COMMENTSLINK>\n"
+"<li><TMPL_VAR COMMENTSLINK></li>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_IF DISCUSSIONLINK>\n"
 "<li><TMPL_VAR DISCUSSIONLINK></li>\n"
 "</TMPL_IF>\n"
+"</TMPL_IF>\n"
 "</ul>\n"
-"</div><!--.actions-->\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:69
+#. type: Plain text
+#: inlinepage.tmpl:71
 #, no-wrap
-msgid "</div><!--.inlinefooter-->\n"
+msgid "<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: inlinepage.tmpl:70
+#. type: Plain text
+#: microblog.tmpl:2
 #, no-wrap
-msgid "</div><!--.inlinepage-->\n"
+msgid "<div class=\"microblog\">\n"
 msgstr ""
 
-# type: Plain text
-#: misc.tmpl:19
+#. type: Plain text
+#: microblog.tmpl:6
 #, no-wrap
 msgid ""
-"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
-" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
-"<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
-"<head>\n"
-"<TMPL_IF NAME=\"FORCEBASEURL\">\n"
-"<base href=\"<TMPL_VAR FORCEBASEURL>\" />\n"
+"<div class=\"inlinecontent\">\n"
+"<TMPL_VAR CONTENT>\n"
+"</div>\n"
+msgstr ""
+
+#. type: Plain text
+#: microblog.tmpl:8
+#, no-wrap
+msgid "<div class=\"microblog-header\">\n"
+msgstr ""
+
+#. type: Plain text
+#: microblog.tmpl:18
+#, no-wrap
+msgid ""
+"<TMPL_IF AUTHOR>\n"
+"<span class=\"author\">\n"
+"<TMPL_IF AUTHORURL>\n"
+"<a href=\"<TMPL_VAR AUTHORURL>\"><TMPL_VAR AUTHOR></a>\n"
 "<TMPL_ELSE>\n"
-"<base href=\"<TMPL_VAR BASEURL>\" />\n"
+"<TMPL_VAR AUTHOR>\n"
 "</TMPL_IF>\n"
-"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"
-"<title><TMPL_VAR TITLE></title>\n"
-"<link rel=\"stylesheet\" href=\"<TMPL_VAR BASEURL>style.css\" "
-"type=\"text/css\" />\n"
-"<link rel=\"stylesheet\" href=\"<TMPL_VAR BASEURL>local.css\" "
-"type=\"text/css\" />\n"
-"<TMPL_IF NAME=\"FAVICON\">\n"
-"<link rel=\"icon\" href=\"<TMPL_VAR BASEURL><TMPL_VAR FAVICON>\" "
-"type=\"image/x-icon\" />\n"
+"</span>\n"
 "</TMPL_IF>\n"
-"</head>\n"
-"<body>\n"
 msgstr ""
 
-# type: Plain text
-#: misc.tmpl:25
+#. type: Plain text
+#: microblog.tmpl:20
+#, no-wrap
+msgid "&mdash; <TMPL_VAR CTIME>\n"
+msgstr ""
+
+#. type: Plain text
+#: microblog.tmpl:22
 #, no-wrap
 msgid ""
-"<div class=\"header\">\n"
-"<span>\n"
-"<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>\n"
-"</span>\n"
-"</div>\n"
+"</div> <!--.microblog-header-->\n"
+"</div> <!--.microblog-->\n"
 msgstr ""
 
-# type: Plain text
-#: misc.tmpl:29
+#. type: Plain text
+#: openid-selector.tmpl:8
 #, no-wrap
 msgid ""
-"<div id=\"content\">\n"
-"<TMPL_VAR PAGEBODY>\n"
-"</div>\n"
+"<script type=\"text/javascript\" "
+"src=\"ikiwiki/openid/jquery.js\"></script>\n"
+"<script type=\"text/javascript\" "
+"src=\"ikiwiki/openid/openid-jquery.js\"></script>\n"
+"<script type=\"text/javascript\">\n"
+"$(document).ready(function() {\n"
+"\topenid.init('openid_identifier','<TMPL_IF "
+"NONOPENIDFORM>nonopenidform</TMPL_IF>');\n"
+"});\n"
+"</script>\n"
 msgstr ""
 
-# type: Plain text
-#: misc.tmpl:33
+#. type: Plain text
+#: openid-selector.tmpl:12
 #, no-wrap
 msgid ""
-"<div id=\"footer\">\n"
-"<!-- from <TMPL_VAR NAME=WIKINAME> -->\n"
-"</div>\n"
+"<noscript>\n"
+"<h2>OpenID:</h2>\n"
+"</noscript>\n"
 msgstr ""
 
-# type: Plain text
-#: misc.tmpl:35 page.tmpl:125
+#. type: Plain text
+#: openid-selector.tmpl:18
 #, no-wrap
 msgid ""
-"</body>\n"
-"</html>\n"
+"<form action=\"<TMPL_VAR CGIURL>\" method=\"get\" id=\"openid_form\">\n"
+"\t<fieldset>\n"
+"\t\t<script>\n"
+"\t\t$('fieldset').append(\"<legend>Select your account "
+"provider</legend>\");\n"
+"\t\t</script>\n"
+msgstr ""
+
+#. type: Plain text
+#: openid-selector.tmpl:34
+#, no-wrap
+msgid ""
+"\t\t<input type=\"hidden\" name=\"do\" value=\"signin\" />\n"
+"\t\t<input type=\"hidden\" name=\"action\" value=\"verify\" />\n"
+"\t\t<div id=\"openid_choice\">\n"
+"\t\t\t<div id=\"openid_btns\"></div>\n"
+"\t\t</div>\n"
+"\t\t<div id=\"openid_input_area\">\n"
+"\t\t\t<label for=\"openid_identifier\" class=\"block\">Enter your "
+"OpenID:</label>\n"
+"\t\t\t<input id=\"openid_identifier\" name=\"openid_identifier\" "
+"type=\"text\" value=\"<TMPL_VAR OPENID_URL>\"/>\n"
+"\t\t\t<input id=\"openid_submit\" type=\"submit\" value=\"Login\"/>\n"
+"\t\t</div>\n"
+"\t\t<TMPL_IF OPENID_ERROR>\n"
+"\t\t<div class=\"error\"><TMPL_VAR OPENID_ERROR></div>\n"
+"\t\t</TMPL_IF>\n"
+"\t</fieldset>\n"
+"</form>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:19
+#. type: Plain text
+#: openid-selector.tmpl:43
 #, no-wrap
 msgid ""
-"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
+"<div id=\"nonopenidform\">\n"
+"<TMPL_IF NONOPENIDFORM>\n"
+"<br />\n"
+"<noscript>\n"
+"<h2>Other:</h2>\n"
+"</noscript>\n"
+"</TMPL_IF>\n"
+"<TMPL_VAR NONOPENIDFORM>\n"
+"</div>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:33
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><!DOCTYPE html>\n"
+"<html>\n"
+"<TMPL_ELSE><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
 " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
 "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n"
+"</TMPL_IF>\n"
 "<head>\n"
-"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"
+"<TMPL_IF DYNAMIC>\n"
+"<TMPL_IF FORCEBASEURL><base href=\"<TMPL_VAR FORCEBASEURL>\" /><TMPL_ELSE>\n"
+"<TMPL_IF BASEURL><base href=\"<TMPL_VAR BASEURL>\" /></TMPL_IF>\n"
+"</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF HTML5><meta charset=\"utf-8\" /><TMPL_ELSE><meta "
+"http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" "
+"/></TMPL_IF>\n"
+"<meta http-equiv=\"Cache-Control\" content=\"must-revalidate\" />\n"
 "<title><TMPL_VAR TITLE></title>\n"
-"<TMPL_IF NAME=\"FAVICON\">\n"
+"<TMPL_IF FAVICON>\n"
 "<link rel=\"icon\" href=\"<TMPL_VAR BASEURL><TMPL_VAR FAVICON>\" "
 "type=\"image/x-icon\" />\n"
 "</TMPL_IF>\n"
 "<link rel=\"stylesheet\" href=\"<TMPL_VAR BASEURL>style.css\" "
 "type=\"text/css\" />\n"
+"<TMPL_IF LOCAL_CSS>\n"
+"<link rel=\"stylesheet\" href=\"<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>\" "
+"type=\"text/css\" />\n"
+"<TMPL_ELSE>\n"
 "<link rel=\"stylesheet\" href=\"<TMPL_VAR BASEURL>local.css\" "
 "type=\"text/css\" />\n"
-"<TMPL_IF NAME=\"EDITURL\">\n"
+"</TMPL_IF>\n"
+"<TMPL_IF EDITURL>\n"
 "<link rel=\"alternate\" type=\"application/x-wiki\" title=\"Edit this page\" "
 "href=\"<TMPL_VAR EDITURL>\" />\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"FEEDLINKS\"><TMPL_VAR FEEDLINKS></TMPL_IF>\n"
-"<TMPL_IF NAME=\"META\"><TMPL_VAR META></TMPL_IF>\n"
+"<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>\n"
+"<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>\n"
+"<TMPL_IF META><TMPL_VAR META></TMPL_IF>\n"
 "</head>\n"
 "<body>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:36
+#. type: Plain text
+#: page.tmpl:35
 #, no-wrap
 msgid ""
-"<div class=\"pageheader\">\n"
-"<div class=\"header\">\n"
+"<TMPL_IF HTML5><article class=\"page\"><TMPL_ELSE><div "
+"class=\"page\"></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:55
+#, no-wrap
+msgid ""
+"<TMPL_IF HTML5><section class=\"pageheader\"><TMPL_ELSE><div "
+"class=\"pageheader\"></TMPL_IF>\n"
+"<TMPL_IF HTML5><header class=\"header\"><TMPL_ELSE><div "
+"class=\"header\"></TMPL_IF>\n"
 "<span>\n"
 "<span class=\"parentlinks\">\n"
-"<TMPL_LOOP NAME=\"PARENTLINKS\">\n"
-"<a href=\"<TMPL_VAR NAME=URL>\"><TMPL_VAR NAME=PAGE></a>/ \n"
+"<TMPL_LOOP PARENTLINKS>\n"
+"<a href=\"<TMPL_VAR URL>\"><TMPL_VAR PAGE></a>/ \n"
 "</TMPL_LOOP>\n"
 "</span>\n"
 "<span class=\"title\">\n"
 "<TMPL_VAR TITLE>\n"
+"<TMPL_IF ISTRANSLATION>\n"
+"&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)\n"
+"</TMPL_IF>\n"
 "</span>\n"
-"</span><!--.header-->\n"
-"<TMPL_IF NAME=\"SEARCHFORM\">\n"
+"</span>\n"
+"<TMPL_IF SEARCHFORM>\n"
 "<TMPL_VAR SEARCHFORM>\n"
 "</TMPL_IF>\n"
-"</div>\n"
+"<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:59
+#. type: Plain text
+#: page.tmpl:89
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"HAVE_ACTIONS\">\n"
-"<div class=\"actions\">\n"
+"<TMPL_IF HAVE_ACTIONS>\n"
+"<TMPL_IF HTML5><nav class=\"actions\"><TMPL_ELSE><div "
+"class=\"actions\"></TMPL_IF>\n"
 "<ul>\n"
-"<TMPL_IF NAME=\"EDITURL\">\n"
+"<TMPL_IF EDITURL>\n"
 "<li><a href=\"<TMPL_VAR EDITURL>\" rel=\"nofollow\">Edit</a></li>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"RECENTCHANGESURL\">\n"
+"<TMPL_IF RECENTCHANGESURL>\n"
 "<li><a href=\"<TMPL_VAR RECENTCHANGESURL>\">RecentChanges</a></li>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"HISTORYURL\">\n"
+"<TMPL_IF HISTORYURL>\n"
 "<li><a href=\"<TMPL_VAR HISTORYURL>\">History</a></li>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"PREFSURL\">\n"
+"<TMPL_IF GETSOURCEURL>\n"
+"<li><a href=\"<TMPL_VAR GETSOURCEURL>\">Source</a></li>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF PREFSURL>\n"
 "<li><a href=\"<TMPL_VAR PREFSURL>\">Preferences</a></li>\n"
 "</TMPL_IF>\n"
-"<TMPL_IF NAME=\"DISCUSSIONLINK\">\n"
-"<li><TMPL_VAR DISCUSSIONLINK><br /></li>\n"
+"<TMPL_IF ACTIONS>\n"
+"<TMPL_LOOP ACTIONS>\n"
+"<li><TMPL_VAR ACTION></li>\n"
+"</TMPL_LOOP>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF COMMENTSLINK>\n"
+"<li><TMPL_VAR COMMENTSLINK></li>\n"
+"<TMPL_ELSE>\n"
+"<TMPL_IF DISCUSSIONLINK>\n"
+"<li><TMPL_VAR DISCUSSIONLINK></li>\n"
+"</TMPL_IF>\n"
 "</TMPL_IF>\n"
 "</ul>\n"
-"</div>\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
 "</TMPL_IF>\n"
-"</div> <!-- .pageheader -->\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:65
+#. type: Plain text
+#: page.tmpl:106
+#, no-wrap
+msgid ""
+"<TMPL_IF OTHERLANGUAGES>\n"
+"<TMPL_IF HTML5><nav id=\"otherlanguages\"><TMPL_ELSE><div "
+"id=\"otherlanguages\"></TMPL_IF>\n"
+"<ul>\n"
+"<TMPL_LOOP OTHERLANGUAGES>\n"
+"<li>\n"
+"<a href=\"<TMPL_VAR URL>\"><TMPL_VAR LANGUAGE></a>\n"
+"<TMPL_IF MASTER>\n"
+"(master)\n"
+"<TMPL_ELSE>\n"
+"&nbsp;(<TMPL_VAR PERCENT>%)\n"
+"</TMPL_IF>\n"
+"</li>\n"
+"</TMPL_LOOP>\n"
+"</ul>\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
+"</TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:108
+#, no-wrap
+msgid "<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:114
 #, no-wrap
 msgid ""
 "<TMPL_IF SIDEBAR>\n"
-"<div id=\"sidebar\">\n"
+"<TMPL_IF HTML5><aside class=\"sidebar\"><TMPL_ELSE><div "
+"class=\"sidebar\"></TMPL_IF>\n"
 "<TMPL_VAR SIDEBAR>\n"
-"</div>\n"
+"<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>\n"
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:69
+#. type: Plain text
+#: page.tmpl:116
+#, no-wrap
+msgid "<div id=\"pagebody\">\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:120
 #, no-wrap
 msgid ""
-"<div id=\"content\">\n"
+"<TMPL_IF HTML5><section id=\"content\"><TMPL_ELSE><div "
+"id=\"content\"></TMPL_IF>\n"
 "<TMPL_VAR CONTENT>\n"
+"<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:133
+#, no-wrap
+msgid ""
+"<TMPL_IF COMMENTS>\n"
+"<TMPL_IF HTML5><section id=\"comments\"><TMPL_ELSE><div "
+"id=\"comments\"></TMPL_IF>\n"
+"<TMPL_VAR COMMENTS>\n"
+"<TMPL_IF ADDCOMMENTURL>\n"
+"<div class=\"addcomment\">\n"
+"<a href=\"<TMPL_VAR ADDCOMMENTURL>\">Add a comment</a>\n"
 "</div>\n"
+"<TMPL_ELSE>\n"
+"<div class=\"addcomment\">Comments on this page are closed.</div>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>\n"
+"</TMPL_IF>\n"
+msgstr ""
+
+#. type: Plain text
+#: page.tmpl:135
+#, no-wrap
+msgid "</div>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:72
+#. type: Plain text
+#: page.tmpl:139
 #, no-wrap
 msgid ""
-"<div id=\"footer\" class=\"pagefooter\">\n"
-"<div id=\"pageinfo\">\n"
+"<TMPL_IF HTML5><footer id=\"footer\" class=\"pagefooter\"><TMPL_ELSE><div "
+"id=\"footer\" class=\"pagefooter\"></TMPL_IF>\n"
+"<TMPL_UNLESS DYNAMIC>\n"
+"<TMPL_IF HTML5><nav id=\"pageinfo\"><TMPL_ELSE><div "
+"id=\"pageinfo\"></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:81
+#. type: Plain text
+#: page.tmpl:148
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"TAGS\">\n"
-"<div class=\"tags\">\n"
+"<TMPL_IF TAGS>\n"
+"<TMPL_IF HTML5><nav class=\"tags\"><TMPL_ELSE><div "
+"class=\"tags\"></TMPL_IF>\n"
 "Tags:\n"
-"<TMPL_LOOP NAME=\"TAGS\">\n"
-"<TMPL_VAR NAME=LINK>\n"
+"<TMPL_LOOP TAGS>\n"
+"<TMPL_VAR LINK>\n"
 "</TMPL_LOOP>\n"
-"</div>\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:99
+#. type: Plain text
+#: page.tmpl:166
 #, no-wrap
 msgid ""
-"<TMPL_IF NAME=\"BACKLINKS\">\n"
-"<div id=\"backlinks\">\n"
+"<TMPL_IF BACKLINKS>\n"
+"<TMPL_IF HTML5><nav id=\"backlinks\"><TMPL_ELSE><div "
+"id=\"backlinks\"></TMPL_IF>\n"
 "Links:\n"
-"<TMPL_LOOP NAME=\"BACKLINKS\">\n"
-"<a href=\"<TMPL_VAR NAME=URL>\"><TMPL_VAR NAME=PAGE></a>\n"
+"<TMPL_LOOP BACKLINKS>\n"
+"<a href=\"<TMPL_VAR URL>\"><TMPL_VAR PAGE></a>\n"
 "</TMPL_LOOP>\n"
-"<TMPL_IF NAME=\"MORE_BACKLINKS\">\n"
+"<TMPL_IF MORE_BACKLINKS>\n"
 "<span class=\"popup\">...\n"
 "<span class=\"balloon\">\n"
-"<TMPL_LOOP NAME=\"MORE_BACKLINKS\">\n"
-"<a href=\"<TMPL_VAR NAME=URL>\"><TMPL_VAR NAME=PAGE></a>\n"
+"<TMPL_LOOP MORE_BACKLINKS>\n"
+"<a href=\"<TMPL_VAR URL>\"><TMPL_VAR PAGE></a>\n"
 "</TMPL_LOOP>\n"
 "</span>\n"
 "</span>\n"
 "</TMPL_IF>\n"
-"</div><!-- #backlinks -->\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:106
+#. type: Plain text
+#: page.tmpl:173
 #, no-wrap
 msgid ""
 "<TMPL_IF COPYRIGHT>\n"
@@ -808,8 +1249,8 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:113
+#. type: Plain text
+#: page.tmpl:180
 #, no-wrap
 msgid ""
 "<TMPL_IF LICENSE>\n"
@@ -820,27 +1261,36 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:118
+#. type: Plain text
+#: page.tmpl:185
 #, no-wrap
 msgid ""
 "<div class=\"pagedate\">\n"
-"Last edited <TMPL_VAR NAME=MTIME>\n"
-"<!-- Created <TMPL_VAR NAME=CTIME> -->\n"
+"Last edited <TMPL_VAR MTIME>\n"
+"<!-- Created <TMPL_VAR CTIME> -->\n"
 "</div>\n"
 msgstr ""
 
-# type: Plain text
-#: page.tmpl:123
+#. type: Plain text
+#: page.tmpl:191
 #, no-wrap
 msgid ""
-"</div><!-- #pageinfo -->\n"
+"<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>\n"
 "<TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>\n"
-"<!-- from <TMPL_VAR NAME=WIKINAME> -->\n"
-"</div><!-- .pagefooter #footer -->\n"
+"</TMPL_UNLESS>\n"
+"<!-- from <TMPL_VAR WIKINAME> -->\n"
+"<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: page.tmpl:195
+#, no-wrap
+msgid ""
+"</body>\n"
+"</html>\n"
+msgstr ""
+
+#. type: Plain text
 #: passwordmail.tmpl:3
 #, no-wrap
 msgid ""
@@ -848,30 +1298,30 @@ msgid ""
 "<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2] be reset.\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: passwordmail.tmpl:5
 msgid "To change your password, visit the following url, and enter a new password:"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: passwordmail.tmpl:7
 #, no-wrap
 msgid "<TMPL_VAR PASSWORDURL>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: passwordmail.tmpl:10
 msgid ""
 "This url can only be used once to change your password, and it will also "
 "stop working the next time you successfully log in."
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: passwordmail.tmpl:13
 msgid "ikiwiki"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: passwordmail.tmpl:15
 #, no-wrap
 msgid ""
@@ -879,7 +1329,16 @@ msgid ""
 "[2] Located at <TMPL_VAR WIKIURL>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
+#: pocreatepage.tmpl:3
+#, no-wrap
+msgid ""
+"<p>\n"
+"<b>WARNING</b> this page must be written in <TMPL_VAR LANG>.\n"
+"</p>\n"
+msgstr ""
+
+#. type: Plain text
 #: recentchanges.tmpl:7
 #, no-wrap
 msgid ""
@@ -892,7 +1351,7 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: renamesummary.tmpl:26
 #, no-wrap
 msgid ""
@@ -910,14 +1369,14 @@ msgid ""
 "The following pages have been automatically modified to update their links "
 "to <TMPL_VAR DEST>:\n"
 "<ul>\n"
-"<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
+"<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
 "</TMPL_IF>\n"
 "<TMPL_IF BROKENLINKS_CHECKED>\n"
 "<TMPL_IF BROKENLINKS>\n"
 "The following pages still link to <TMPL_VAR SRC>:\n"
 "<ul>\n"
-"<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
+"<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
 "</TMPL_IF>\n"
 "</TMPL_IF>\n"
@@ -925,40 +1384,43 @@ msgid ""
 "</TMPL_IF>\n"
 msgstr ""
 
-# type: Plain text
-#: rssitem.tmpl:26
+#. type: Plain text
+#: rssitem.tmpl:29
 #, no-wrap
 msgid ""
 "<item>\n"
-"\t<TMPL_IF NAME=\"AUTHOR\">\n"
+"<TMPL_IF AUTHOR>\n"
 "\t<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>\n"
 "\t<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>\n"
-"\t<TMPL_ELSE>\n"
+"<TMPL_ELSE>\n"
 "\t<title><TMPL_VAR TITLE></title>\n"
-"\t</TMPL_IF>\n"
-"\t<TMPL_IF NAME=\"GUID\">\n"
-"\t  <guid isPermaLink=\"no\"><TMPL_VAR GUID></guid>\n"
-"\t<TMPL_ELSE>\n"
-"\t  <guid><TMPL_VAR URL></guid>\n"
-"\t</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF GUID>\n"
+"\t<guid isPermaLink=\"no\"><TMPL_VAR GUID></guid>\n"
+"<TMPL_ELSE>\n"
+"\t<guid><TMPL_VAR URL></guid>\n"
+"</TMPL_IF>\n"
 "\t<link><TMPL_VAR PERMALINK></link>\n"
-"\t<TMPL_IF NAME=\"CATEGORIES\">\n"
-"\t<TMPL_LOOP NAME=\"CATEGORIES\">\n"
+"<TMPL_IF CATEGORIES>\n"
+"<TMPL_LOOP CATEGORIES>\n"
 "\t<category><TMPL_VAR CATEGORY></category>\n"
-"\t</TMPL_LOOP>\n"
-"\t</TMPL_IF>\n"
+"</TMPL_LOOP>\n"
+"</TMPL_IF>\n"
 "\t<pubDate><TMPL_VAR CDATE_822></pubDate>\n"
 "\t<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>\n"
-"\t<TMPL_IF NAME=\"ENCLOSURE\">\n"
+"<TMPL_IF ENCLOSURE>\n"
 "\t<enclosure url=\"<TMPL_VAR ENCLOSURE>\" type=\"<TMPL_VAR TYPE>\" "
 "length=\"<TMPL_VAR LENGTH>\" />\n"
-"\t<TMPL_ELSE>\n"
+"<TMPL_ELSE>\n"
 "\t<description><TMPL_VAR CONTENT ESCAPE=HTML></description>\n"
-"\t</TMPL_IF>\n"
+"</TMPL_IF>\n"
+"<TMPL_IF COMMENTSURL>\n"
+"\t<comments><TMPL_VAR COMMENTSURL></comments>\n"
+"</TMPL_IF>\n"
 "</item>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: rsspage.tmpl:11
 #, no-wrap
 msgid ""
@@ -975,18 +1437,19 @@ msgid ""
 "</rss>\n"
 msgstr ""
 
-# type: Plain text
-#: searchform.tmpl:5
+#. type: Plain text
+#: searchform.tmpl:6
 #, no-wrap
 msgid ""
 "<form method=\"get\" action=\"<TMPL_VAR SEARCHACTION>\" id=\"searchform\">\n"
 "<div>\n"
-"<input type=\"text\" id=\"searchbox\" name=\"P\" value=\"\" size=\"16\" />\n"
+"<input type=\"text\" id=\"searchbox\" name=\"P\" value=\"\" size=\"16\"\n"
+"<TMPL_IF HTML5>placeholder=\"search\"</TMPL_IF> />\n"
 "</div>\n"
 "</form>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:10
 #, no-wrap
 msgid ""
@@ -1003,7 +1466,7 @@ msgid ""
 "}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:16
 #, no-wrap
 msgid ""
@@ -1015,7 +1478,7 @@ msgid ""
 "}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:19
 #, no-wrap
 msgid ""
@@ -1024,7 +1487,7 @@ msgid ""
 "$def{PAGE,$if{$gt{$1,9},$if{$gt{$1,99},$P{$1,$div{$1,100}}}$P{$1,$mod{$div{$1,10},10}}}$P{$1,$mod{$1,10}}}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:23
 #, no-wrap
 msgid ""
@@ -1033,7 +1496,7 @@ msgid ""
 "}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:25
 #, no-wrap
 msgid ""
@@ -1041,19 +1504,19 @@ msgid ""
 "VALUE=\"Previous\">}}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:27
 #, no-wrap
 msgid "$def{PAGE,<INPUT TYPE=submit NAME=\"[\" VALUE=\"$1\">}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:29
 #, no-wrap
 msgid "$def{SPAGE,<INPUT TYPE=submit NAME=\"[\" VALUE=\"$1\" DISABLED=disabled>}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:31
 #, no-wrap
 msgid ""
@@ -1061,19 +1524,19 @@ msgid ""
 "VALUE=\"Next\">}}\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:33
 #, no-wrap
 msgid "<p>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:79
 #, no-wrap
 msgid ""
 "<FORM NAME=P METHOD=GET \n"
 "ACTION=\"$html{$env{CGIURL}}\" TARGET=\"_top\">\n"
-"<center>\n"
+"<div style=\"text-align:center\">\n"
 "<INPUT NAME=P VALUE=\"$html{$query}\" SIZE=65>\n"
 "<INPUT TYPE=SUBMIT VALUE=\"Search\">\n"
 "$env{HELPLINK}\n"
@@ -1095,7 +1558,7 @@ msgid ""
 "exactly $nice{$msize} matches}\n"
 "}\n"
 "<hr>\n"
-"</center>\n"
+"</div>\n"
 "$list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},<b>,</b>/<b>,</b>}:&nbsp;$nice{$freq{$_}}},Term "
 "frequencies: ,$. ,}\n"
 "<br><small>Search took $time seconds</small>\n"
@@ -1127,16 +1590,17 @@ msgid ""
 "</table>\n"
 msgstr ""
 
-# type: Plain text
+#. type: Plain text
 #: searchquery.tmpl:81
 #, no-wrap
-msgid "<br><center>\n"
+msgid "<br />\n"
 msgstr ""
 
-# type: Plain text
-#: searchquery.tmpl:85
+#. type: Plain text
+#: searchquery.tmpl:86
 #, no-wrap
 msgid ""
+"<div style=\"text-align:center\">\n"
 "${suppress next, prev, and page links if there's only one page}\n"
 "$if{$ne{$lastpage,1},\n"
 "$set{a,$if{$opt{pagelink_height}, "
@@ -1144,8 +1608,8 @@ msgid ""
 "WIDTH=$opt{pagelink_width}}}\n"
 msgstr ""
 
-# type: Plain text
-#: searchquery.tmpl:112
+#. type: Plain text
+#: searchquery.tmpl:113
 #, no-wrap
 msgid ""
 "${1-W ... X-(this)-Y ...}\n"
@@ -1162,7 +1626,7 @@ msgid ""
 "$NEXT\n"
 "}\n"
 "}}\n"
-"</center><br>\n"
+"</div><br />\n"
 "$if{$dbname,<INPUT TYPE=hidden NAME=DB VALUE=\"$html{$dbname}\">}\n"
 "$if{$ne{$topdoc,0},<INPUT TYPE=hidden NAME=TOPDOC VALUE=$topdoc>}\n"
 "$if{$ne{$hitsperpage,10},<INPUT TYPE=hidden NAME=HITSPERPAGE "
@@ -1181,8 +1645,15 @@ msgid ""
 "href=\"http://www.xapian.org/\">$html{$version}</a></small></i></div>\n"
 msgstr ""
 
-# type: Plain text
-#: titlepage.tmpl:1
+#. type: Plain text
+#: titlepage.tmpl:7
 #, no-wrap
-msgid "<p><a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a></p>\n"
+msgid ""
+"<p>\n"
+"<TMPL_IF PERMALINK>\n"
+"<a href=\"<TMPL_VAR PERMALINK>\"><TMPL_VAR TITLE></a>\n"
+"<TMPL_ELSE>\n"
+"<a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a>\n"
+"</TMPL_IF>\n"
+"</p>\n"
 msgstr ""