summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/basewiki.pot932
-rw-r--r--po/directives.pot1015
-rw-r--r--po/smiley.pot8
-rw-r--r--po/templates.pot1195
4 files changed, 2070 insertions, 1080 deletions
diff --git a/po/basewiki.pot b/po/basewiki.pot
index e26daca..6fe9408 100644
--- a/po/basewiki.pot
+++ b/po/basewiki.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ikiwiki basewiki 2.62.1\n"
-"POT-Creation-Date: 2009-05-25 23:07+0300\n"
+"POT-Creation-Date: 2010-07-15 19: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"
@@ -16,53 +16,113 @@ msgstr ""
"Content-Transfer-Encoding: 8bit"
#. type: Plain text
-#: directive.mdwn:1 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/preprocessordirective.mdwn:2 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 templates.mdwn:1
+#: ikiwiki.mdwn:1 ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/pagespec/po.mdwn:20 ikiwiki/pagespec/sorting.mdwn:26 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 templates.mdwn:80
#, no-wrap
msgid "[[!meta robots=\"noindex, follow\"]]\n"
msgstr ""
#. type: Plain text
-#: directive.mdwn:4 ikiwiki/directive.mdwn:4
+#: ikiwiki.mdwn:6
+#, no-wrap
+msgid ""
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+" then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki.mdwn:8
+msgid "Some documentation on using ikiwiki:"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/formatting]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/wikilink]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/subpage]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/pagespec]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/directive]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/markdown]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/openid]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[ikiwiki/searching]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki.mdwn:17
+msgid "[[templates]]"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive.mdwn:4
msgid ""
"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
"with `!` and may contain parameters. The general form is:"
msgstr ""
#. type: Plain text
-#: directive.mdwn:6 ikiwiki/directive.mdwn:6
+#: ikiwiki/directive.mdwn:6
#, no-wrap
msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
msgstr ""
#. type: Plain text
-#: directive.mdwn:9 ikiwiki/directive.mdwn:9
+#: ikiwiki/directive.mdwn:9
msgid ""
"This gets expanded before the rest of the page is processed, and can be used "
"to transform the page in various ways."
msgstr ""
#. type: Plain text
-#: directive.mdwn:12 ikiwiki/directive.mdwn:12
+#: ikiwiki/directive.mdwn:12
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 ""
#. type: Plain text
-#: directive.mdwn:14 ikiwiki/directive.mdwn:14
+#: ikiwiki/directive.mdwn:14
#, no-wrap
msgid "\t\\[[!tag foo]]\n"
msgstr ""
#. type: Plain text
-#: directive.mdwn:17 ikiwiki/directive.mdwn:17
+#: ikiwiki/directive.mdwn:17
msgid ""
"A directive does not need to all be on one line, it can be wrapped to "
"multiple lines if you like:"
msgstr ""
#. type: Plain text
-#: directive.mdwn:20 ikiwiki/directive.mdwn:20
+#: ikiwiki/directive.mdwn:20
#, no-wrap
msgid ""
"\t\\[[!directive foo=\"baldersnatch\"\n"
@@ -70,7 +130,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: directive.mdwn:24 ikiwiki/directive.mdwn:24
+#: ikiwiki/directive.mdwn:24
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 "
@@ -78,128 +138,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: directive.mdwn:25 ikiwiki/directive.mdwn:25
+#: ikiwiki/directive.mdwn:25
#, no-wrap
msgid "\t\\[[!directive text=\"\"\"\n"
msgstr ""
#. type: Bullet: ' 1. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
msgid "\"foo\""
msgstr ""
#. type: Bullet: ' 2. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
msgid "\"bar\""
msgstr ""
#. type: Bullet: ' 3. '
-#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
msgid "\"baz\""
msgstr ""
#. type: Plain text
-#: directive.mdwn:40 ikiwiki/directive.mdwn:40
+#: ikiwiki/directive.mdwn:38
msgid ""
"ikiwiki also has an older syntax for directives, which requires a space in "
-"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
+"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This "
"syntax has several disadvantages: it requires a space after directives with "
"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
"[[wikilinks|ikiwiki/wikilink]]. ikiwiki now provides the `!`-prefixed "
-"syntax shown above as the preferred alternative. However, ikiwiki still "
-"supports wikis using the older syntax, if the `prefix_directives` option is "
-"not enabled. For backward compatibility with existing wikis, this option "
-"currently defaults to off, so ikiwiki supports the old syntax."
+"syntax shown above as default. However, ikiwiki still supports wikis using "
+"the older syntax, if the `prefix_directives` option is disabled."
msgstr ""
#. type: Plain text
-#: directive.mdwn:41 ikiwiki/directive.mdwn:41 ikiwiki/formatting.mdwn:103
+#: ikiwiki/directive.mdwn:39 ikiwiki/formatting.mdwn:103
#, no-wrap
msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
msgstr ""
#. type: Plain text
-#: directive.mdwn:43 ikiwiki/directive.mdwn:43
+#: ikiwiki/directive.mdwn:41
msgid "Here is a list of currently available directives in this wiki:"
msgstr ""
#. type: Plain text
-#: directive.mdwn:44 ikiwiki/directive.mdwn:44
+#: ikiwiki/directive.mdwn:42
#, no-wrap
msgid "[[!listdirectives ]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki.mdwn:6
-#, no-wrap
-msgid ""
-"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
-"[[!if test=\"enabled(version)\"\n"
-" then=\"(Currently running version [[!version ]].)\"\n"
-"]]\n"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki.mdwn:8
-msgid "Some documentation on using ikiwiki:"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/formatting]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/wikilink]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/subpage]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/pagespec]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/directive]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/markdown]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/openid]]"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki.mdwn:16
-msgid "[[ikiwiki/searching]]"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/blog.mdwn:6
-msgid ""
-"This page has been removed from ikiwiki's basewiki. For documentation about "
-"creating a blog with ikiwiki, see the documentation of the [[!iki "
-"ikiwiki/directive/inline desc=inline]] directive."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/blog.mdwn:8
-msgid ""
-"Please update your links, as this redirection page will be removed in a "
-"future ikiwiki release."
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/formatting.mdwn:1
#, no-wrap
msgid "[[!meta title=\"Formatting wiki pages\"]]\n"
@@ -221,7 +209,7 @@ msgstr ""
#. type: Plain text
#: ikiwiki/formatting.mdwn:12
msgid ""
-"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
+"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by "
"placing it in single or double asterisks."
msgstr ""
@@ -270,40 +258,40 @@ msgid ""
"of the header:"
msgstr ""
-#. type: Plain text
+#. type: Title #
#: ikiwiki/formatting.mdwn:29
#, no-wrap
-msgid "# # h1\n"
+msgid "# h1"
msgstr ""
-#. type: Plain text
+#. type: Title ##
#: ikiwiki/formatting.mdwn:30
#, no-wrap
-msgid "## ## h2\n"
+msgid "## h2"
msgstr ""
-#. type: Plain text
+#. type: Title ###
#: ikiwiki/formatting.mdwn:31
#, no-wrap
-msgid "### ### h3\n"
+msgid "### h3"
msgstr ""
-#. type: Plain text
+#. type: Title ####
#: ikiwiki/formatting.mdwn:32
#, no-wrap
-msgid "#### #### h4\n"
+msgid "#### h4"
msgstr ""
-#. type: Plain text
+#. type: Title #####
#: ikiwiki/formatting.mdwn:33
#, no-wrap
-msgid "##### ##### h5\n"
+msgid "##### h5"
msgstr ""
-#. type: Plain text
+#. type: Title ######
#: ikiwiki/formatting.mdwn:34
#, no-wrap
-msgid "###### ###### h6\n"
+msgid "###### h6"
msgstr ""
#. type: Plain text
@@ -314,12 +302,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/formatting.mdwn:39 ikiwiki/formatting.mdwn:55 index.mdwn:5 sandbox.mdwn:3
-#, no-wrap
-msgid "----\n"
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/formatting.mdwn:42
#, no-wrap
msgid "To quote someone, prefix the quote with \">\":\n"
@@ -444,7 +426,7 @@ msgid "\t\\[[!toc]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/formatting.mdwn:91 recentchanges.mdwn:1
+#: ikiwiki/formatting.mdwn:91 ikiwiki/pagespec/sorting.mdwn:15 recentchanges.mdwn:1
#, no-wrap
msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
msgstr ""
@@ -498,16 +480,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/markdown.mdwn:10
+#: ikiwiki/markdown.mdwn:8
msgid ""
"For documentation about the markdown syntax, see [[formatting]] and "
-"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A "
-"[markdown mode](http://jblevins.org/projects/markdown-mode/) for emacs can "
-"help in editing."
+"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)."
msgstr ""
#. type: Plain text
-#: ikiwiki/markdown.mdwn:13
+#: ikiwiki/markdown.mdwn:11
msgid ""
"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part "
"of the markdown syntax, and are the only bit of markup that this wiki "
@@ -538,52 +518,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/openid.mdwn:13
-msgid "To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[MyOpenID](https://www.myopenid.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[GetOpenID](https://getopenid.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[Videntity](http://videntity.org/)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[LiveJournal](http://www.livejournal.com/openid/)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
-msgid "[TrustBearer](https://openid.trustbearer.com/)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/openid.mdwn:20
+#: ikiwiki/openid.mdwn:15
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
-#: ikiwiki/openid.mdwn:22
+#: ikiwiki/openid.mdwn:16
#, 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
-#: ikiwiki/openid.mdwn:26
+#: ikiwiki/openid.mdwn:20
msgid ""
"To sign in to this wiki using OpenID, just enter it in the OpenID field in "
"the signin form. You do not need to give this wiki a password or go through "
@@ -591,20 +540,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/openid.mdwn:28
-#, no-wrap
-msgid "---\n"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/openid.mdwn:32
+#: ikiwiki/openid.mdwn:26
msgid ""
"It's also possible to make a page in the wiki usable as an OpenID url, by "
"delegating it to an openid server. Here's an example of how to do that:"
msgstr ""
#. type: Plain text
-#: ikiwiki/openid.mdwn:34
+#: ikiwiki/openid.mdwn:28
#, no-wrap
msgid ""
"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n"
@@ -667,104 +610,67 @@ msgid ""
"functions:"
msgstr ""
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`link(page)`\" - match only pages that link to a given page (or glob)"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`backlink(page)`\" - match only pages that a given page links to"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_month(month)`\" - match only pages created on the given month"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_day(mday)`\" - or day of the month"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid "\"`creation_year(year)`\" - or year"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`created_after(page)`\" - match only pages created after the given page "
-"was created"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`created_before(page)`\" - match only pages created before the given page "
-"was created"
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`glob(someglob)`\" - match pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
-"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
-"metadata, matching the specified glob."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`user(username)`\" - tests whether a modification is being made by a user "
-"with the specified username. If openid is enabled, an openid can also be put "
-"here."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`admin()`\" - tests whether a modification is being made by one of the "
-"wiki admins."
-msgstr ""
-
-#. type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:50
-msgid ""
-"\"`ip(address)`\" - tests whether a modification is being made from the "
-"specified IP address."
+#. type: Plain text
+#: ikiwiki/pagespec.mdwn:58
+#, no-wrap
+msgid ""
+"* \"`glob(someglob)`\" - matches pages and other files that match the given "
+"glob.\n"
+" Just writing the glob by itself is actually a shorthand for this "
+"function.\n"
+"* \"`page(glob)`\" - like `glob()`, but only matches pages, not other "
+"files\n"
+"* \"`link(page)`\" - matches only pages that link to a given page (or "
+"glob)\n"
+"* \"`tagged(tag)`\" - matches pages that are tagged or link to the given tag "
+"(or\n"
+" tags matched by a glob)\n"
+"* \"`backlink(page)`\" - matches only pages that a given page links to\n"
+"* \"`creation_month(month)`\" - matches only files created on the given "
+"month\n"
+"* \"`creation_day(mday)`\" - or day of the month\n"
+"* \"`creation_year(year)`\" - or year\n"
+"* \"`created_after(page)`\" - matches only files created after the given "
+"page\n"
+" was created\n"
+"* \"`created_before(page)`\" - matches only files created before the given "
+"page\n"
+" was created\n"
+"* \"`internal(glob)`\" - like `glob()`, but matches even internal-use \n"
+" pages that globs do not usually match.\n"
+"* \"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\",\n"
+" \"`license(glob)`\", \"`copyright(glob)`\", \"`guid(glob)`\" \n"
+" - match pages that have the given metadata, matching the specified glob.\n"
+"* \"`user(username)`\" - tests whether a modification is being made by a\n"
+" user with the specified username. If openid is enabled, an openid can "
+"also\n"
+" be put here. Glob patterns can be used in the username. For example, \n"
+" to match all openid users, use `user(*://*)`\n"
+"* \"`admin()`\" - tests whether a modification is being made by one of the\n"
+" wiki admins.\n"
+"* \"`ip(address)`\" - tests whether a modification is being made from the\n"
+" specified IP address.\n"
+"* \"`comment(glob)`\" - matches comments to a page matching the glob.\n"
+"* \"`comment_pending(glob)`\" - matches unmoderated, pending comments.\n"
+"* \"`postcomment(glob)`\" - matches only when comments are being \n"
+" posted to a page matching the specified glob\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:53
+#: ikiwiki/pagespec.mdwn:61
msgid ""
"For example, to match all pages in a blog that link to the page about music "
"and were written in 2005:"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:55
+#: ikiwiki/pagespec.mdwn:63
#, no-wrap
msgid "\tblog/* and link(music) and creation_year(2005)\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:61
+#: ikiwiki/pagespec.mdwn:69
msgid ""
"Note the use of \"and\" in the above example, that means that only pages "
"that match each of the three expressions match the whole. Use \"and\" when "
@@ -774,7 +680,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:65
+#: ikiwiki/pagespec.mdwn:73
msgid ""
"More complex expressions can also be created, by using parentheses for "
"grouping. For example, to match pages in a blog that are tagged with either "
@@ -782,13 +688,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:67
+#: ikiwiki/pagespec.mdwn:75
#, no-wrap
-msgid "\tblog/* and (link(tag/foo) or link(tag/bar))\n"
+msgid "\tblog/* and (tagged(foo) or tagged(bar))\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:73
+#: ikiwiki/pagespec.mdwn:80
msgid ""
"Note that page names in PageSpecs are matched against the absolute filenames "
"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will "
@@ -798,53 +704,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec.mdwn:74
-#, no-wrap
-msgid "## Old syntax\n"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:78
-msgid ""
-"The old PageSpec syntax was called a \"GlobList\", and worked differently in "
-"two ways:"
-msgstr ""
-
-#. type: Bullet: '1. '
-#: ikiwiki/pagespec.mdwn:83
-msgid ""
-"\"and\" and \"or\" were not used; any page matching any item from the list "
-"matched."
-msgstr ""
-
-#. type: Bullet: '2. '
-#: ikiwiki/pagespec.mdwn:83
-msgid ""
-"If an item was prefixed with \"`!`\", then no page matching that item "
-"matched, even if it matched an earlier list item."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:86
-msgid ""
-"For example, here is the old way to match all pages except for the SandBox "
-"and Discussion pages:"
-msgstr ""
-
-#. type: Bullet: ' * '
-#: ikiwiki/pagespec.mdwn:88
-msgid "!SandBox !*/Discussion"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/pagespec.mdwn:91
-msgid ""
-"Using this old syntax is still supported. However, the old syntax is "
-"deprecated and will be removed at some point, and using the new syntax is "
-"recommended."
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/pagespec/attachment.mdwn:5
#, no-wrap
msgid ""
@@ -862,53 +721,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:13
+#: ikiwiki/pagespec/attachment.mdwn:14
msgid ""
-"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 "
-"files to be uploaded by joey into a specific directory, and check all "
-"attachments for virii, something like this could be used:"
+"For example, to limit most users to uploading small images, and nothing "
+"else, while allowing larger mp3 files to be uploaded by joey into a specific "
+"directory, and check all attachments for viruses, something like this could "
+"be used:"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:15
+#: ikiwiki/pagespec/attachment.mdwn:16
#, no-wrap
msgid ""
"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) "
-"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n"
+"and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:18
+#: ikiwiki/pagespec/attachment.mdwn:19
msgid ""
"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
"additional tests:"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:22
+#: ikiwiki/pagespec/attachment.mdwn:23
msgid ""
-"\"`maxsize(size)`\" - Tests whether the attachment is no larger than the "
+"\"`maxsize(size)`\" - tests whether the attachment is no larger than the "
"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", "
"\"gb\" etc can be used to specify the units."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:25
+#: ikiwiki/pagespec/attachment.mdwn:26
msgid ""
-"\"`minsize(size)`\" - Tests whether the attachment is no smaller than the "
+"\"`minsize(size)`\" - tests whether the attachment is no smaller than the "
"specified size."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:29
+#: ikiwiki/pagespec/attachment.mdwn:30
msgid ""
-"\"`ispage()`\" - Tests whether the attachment will be treated by ikiwiki as "
+"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as "
"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other "
"enabled page format)."
msgstr ""
#. type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:33
+#: ikiwiki/pagespec/attachment.mdwn:34
#, no-wrap
msgid ""
" So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
@@ -917,29 +777,110 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:36
+#: ikiwiki/pagespec/attachment.mdwn:37
msgid ""
-"\"`mimetype(foo/bar)`\" - This checks the MIME type of the attachment. You "
-"can include a glob in the type, for example `mimetype(image/*)`."
+"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can "
+"include a glob in the type, for example `mimetype(image/*)`."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:37
-msgid "\"`virusfree()`\" - Checks the attachment with an antiviral program."
+#: ikiwiki/pagespec/attachment.mdwn:38
+msgid "\"`virusfree()`\" - checks the attachment with an antiviral program."
msgstr ""
#. type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:1
+#: ikiwiki/pagespec/po.mdwn:4
#, no-wrap
-msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
+msgid ""
+"[[!if test=\"enabled(po)\"\n"
+" then=\"This wiki has po support **enabled**.\"\n"
+" else=\"This wiki has po support **disabled**.\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:7
+#: ikiwiki/pagespec/po.mdwn:9
msgid ""
-"This page has moved to [[ikiwiki/directive|ikiwiki/directive]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
+"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular "
+"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests "
+"that can be used to improve user navigation in a multi-lingual wiki:"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`lang(LL)`\" - tests whether a page is written in the language specified "
+"as a ISO639-1 (two-letter) language code."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`currentlang()`\" - tests whether a page is written in the same language "
+"as the current page."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/po.mdwn:16
+msgid ""
+"\"`needstranslation()`\" - tests whether a page needs translation work. Only "
+"slave pages match this PageSpec."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/po.mdwn:19
+msgid ""
+"Note that every non-po page is considered to be written in "
+"`po_master_language`, as specified in `ikiwiki.setup`."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:5
+msgid ""
+"Some [[directives|ikiwiki/directive]] that use "
+"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching "
+"pages are shown in. The following sort orders can be specified."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:7
+msgid "`age` - List pages from the most recently created to the oldest."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:9
+msgid "`mtime` - List pages with the most recently modified first."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:11
+#, no-wrap
+msgid ""
+"* `title` - Order by title (page name).\n"
+"[[!if test=\"enabled(sortnaturally)\" then=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:14
+msgid ""
+"`title_natural` - Orders by title, but numbers in the title are treated as "
+"such, (\"1 2 9 10 20\" instead of \"1 10 2 20 9\")"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/pagespec/sorting.mdwn:20
+msgid ""
+"`meta(title)` - Order according to the `\\[[!meta title=\"foo\" "
+"sortas=\"bar\"]]` or `\\[[!meta title=\"foo\"]]` [[ikiwiki/directive]], or "
+"the page name if no full title was set. `meta(author)`, `meta(date)`, "
+"`meta(updated)`, etc. also work."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/pagespec/sorting.mdwn:25
+msgid ""
+"In addition, you can combine several sort orders and/or reverse the order of "
+"sorting, with a string like `age -title` (which would sort by age, then by "
+"title in reverse order if two pages have the same age)."
msgstr ""
#. type: Plain text
@@ -955,7 +896,7 @@ msgstr ""
#: ikiwiki/searching.mdwn:10
msgid ""
"If searching is enabled, you can enter search terms in the search field, as "
-"you'd expect. There are a few special things you can do to constuct more "
+"you'd expect. There are a few special things you can do to construct more "
"powerful searches."
msgstr ""
@@ -1013,8 +954,8 @@ msgstr ""
#: ikiwiki/subpage.mdwn:11
msgid ""
"To add a SubPage, just make a subdirectory and put pages in it. For example, "
-"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage "
-"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be "
+"this page is subpage.mdwn in this wiki's source, and there is also a subpage "
+"subdirectory, which contains subpage/linkingrules.mdwn. Subpages can be "
"nested as deeply as you'd like."
msgstr ""
@@ -1107,14 +1048,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/wikilink.mdwn:14
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/wikilink.mdwn:18
+#: ikiwiki/wikilink.mdwn:15
msgid ""
"WikiLinks are matched with page names in a case-insensitive manner, so you "
"don't need to worry about getting the case the same, and can capitalise "
@@ -1122,7 +1056,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/wikilink.mdwn:22
+#: ikiwiki/wikilink.mdwn:19
msgid ""
"It's also possible to write a WikiLink that uses something other than the "
"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the "
@@ -1130,28 +1064,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/wikilink.mdwn:25
+#: ikiwiki/wikilink.mdwn:22
msgid ""
"To link to an anchor inside a page, you can use something like "
-"`\\[[WikiLink#foo]]`"
+"`\\[[WikiLink#foo]]` ."
msgstr ""
#. type: Plain text
-#: ikiwiki/wikilink.mdwn:26
-#, no-wrap
-msgid "## Directives and WikiLinks\n"
+#: ikiwiki/wikilink.mdwn:25
+msgid ""
+"If the file linked to by a WikiLink looks like an image, it will be "
+"displayed inline on the page."
msgstr ""
#. type: Plain text
-#: ikiwiki/wikilink.mdwn:36
+#: ikiwiki/wikilink.mdwn:29
msgid ""
-"ikiwiki has two syntaxes for [[directives|directive]]. The older syntax "
-"used spaces to distinguish between directives and wikilinks; as a result, "
-"with that syntax in use, you cannot use spaces in WikiLinks, and must "
-"replace spaces with underscores. The newer syntax, enabled with the "
-"`prefix_directives` option in an ikiwiki setup file, prefixes directives "
-"with `!`, and thus does not prevent links with spaces. Future versions of "
-"ikiwiki will turn this option on by default."
+"You can also put an url in a WikiLink, to link to an external page. Email "
+"addresses can also be used to generate a mailto link."
msgstr ""
#. type: Plain text
@@ -1166,7 +1096,7 @@ msgstr ""
#. type: Plain text
#: index.mdwn:7
-msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
+msgid "This wiki is powered by [[ikiwiki]]."
msgstr ""
#. type: Plain text
@@ -1203,16 +1133,16 @@ msgstr ""
msgid "Here's another one with *emphasised* text."
msgstr ""
-#. type: Plain text
+#. type: Title #
#: sandbox.mdwn:9
#, no-wrap
-msgid "# Header\n"
+msgid "Header"
msgstr ""
-#. type: Plain text
+#. type: Title ##
#: sandbox.mdwn:11
#, no-wrap
-msgid "## Subheader\n"
+msgid "Subheader"
msgstr ""
#. type: Plain text
@@ -1298,81 +1228,83 @@ msgid "This page controls what shortcut links the wiki supports."
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#: shortcuts.mdwn:64
+msgid ""
+"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug "
+"#%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid ""
"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
"desc=\"debian-%s@lists.debian.org\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
msgstr ""
#. type: Bullet: '* '
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
msgid ""
"[[!shortcut name=debrt "
"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
msgstr ""
#. type: Plain text
-#: shortcuts.mdwn:62
+#: shortcuts.mdwn:64
#, no-wrap
msgid ""
"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
@@ -1433,19 +1365,25 @@ msgid ""
"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
+"* [[!shortcut name=cpanrt "
+"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN "
+"RT#%s\"]]\n"
+"* [[!shortcut name=novellbug "
+"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n"
msgstr ""
#. type: Plain text
-#: shortcuts.mdwn:68
+#: shortcuts.mdwn:70
msgid ""
"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, "
"\"%s\" is replaced with the text passed to the named shortcut, after "
-"url-encoding it, and '%S' is replaced with the raw, non-encoded text. The "
-"optional `desc` parameter controls the description of the link."
+"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, "
+"non-encoded text. The optional `desc` parameter controls the description of "
+"the link."
msgstr ""
#. type: Plain text
-#: shortcuts.mdwn:73
+#: shortcuts.mdwn:75
msgid ""
"Remember that the `name` you give the shortcut will become a new "
"[[ikiwiki/directive]]. Avoid using a `name` that conflicts with an existing "
@@ -1454,207 +1392,177 @@ msgid ""
msgstr ""
#. type: Plain text
-#: shortcuts.mdwn:77
+#: shortcuts.mdwn:79
msgid ""
"If you come up with a shortcut that you think others might find useful, "
"consider contributing it to the [shortcuts page on the ikiwiki "
-"ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
+"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki "
"will include your shortcut in the standard underlay."
msgstr ""
#. type: Plain text
-#: templates.mdwn:6
-#, no-wrap
+#: templates.mdwn:3
msgid ""
-"[[!if test=\"enabled(template)\"\n"
-"then=\"This wiki has templates **enabled**.\"\n"
-"else=\"This wiki has templates **disabled**.\"\n"
-"]]\n"
+"[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
+"you can fully customise this site."
msgstr ""
#. type: Plain text
-#: templates.mdwn:9
+#: templates.mdwn:8
msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
msgstr ""
#. type: Plain text
-#: templates.mdwn:10
-#, no-wrap
-msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
+#: templates.mdwn:12
+msgid ""
+"Ikiwiki uses the HTML::Template module as its template engine. This supports "
+"things like conditionals and loops in templates and is pretty easy to "
+"learn. All you really need to know to modify templates is this:"
msgstr ""
-#. type: Plain text
-#: templates.mdwn:14
-msgid "These templates are available for inclusion onto other pages in this wiki:"
+#. type: Bullet: '* '
+#: templates.mdwn:18
+msgid "To insert the value of a template variable, use `<TMPL_VAR variable>`."
msgstr ""
-#. type: Plain text
-#: templates.mdwn:17
-#, no-wrap
+#. type: Bullet: '* '
+#: templates.mdwn:18
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+#: templates.mdwn:18
msgid ""
-"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
-"sort=title template=titlepage]]\n"
+"To use one block of text if a variable is set and a second if it's not, use "
+"`<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`"
msgstr ""
#. type: Plain text
#: templates.mdwn:19
#, no-wrap
-msgid "## Using a template\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
msgstr ""
-#. type: Plain text
-#: templates.mdwn:22
-msgid "Using a template works like this:"
+#. type: Title ##
+#: templates.mdwn:20
+#, no-wrap
+msgid "template pages"
msgstr ""
#. type: Plain text
-#: templates.mdwn:24
-#, no-wrap
+#: templates.mdwn:25
msgid ""
-"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-"note.\"\"\"]]\n"
+"The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
msgstr ""
#. type: Plain text
#: templates.mdwn:27
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
+#, no-wrap
+msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
msgstr ""
-#. type: Plain text
-#: templates.mdwn:32
-msgid ""
-"Generally, a value can include any markup that would be allowed in the wiki "
-"page outside the template. Triple-quoting the value even allows quotes to be "
-"included in it. Combined with multi-line quoted values, this allows for "
-"large chunks of marked up text to be embedded into a template:"
+#. type: Title ##
+#: templates.mdwn:28
+#, no-wrap
+msgid "default content for new pages"
msgstr ""
#. type: Plain text
#: templates.mdwn:33
-#, no-wrap
msgid ""
-" \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
-"notes=\"\"\"\n"
-msgstr ""
-
-#. type: Bullet: ' * '
-#: templates.mdwn:37
-msgid "\\[[Charley]]'s sister."
-msgstr ""
-
-#. type: Bullet: ' * '
-#: templates.mdwn:37
-msgid "\"I want to be an astronaut when I grow up.\""
-msgstr ""
-
-#. type: Bullet: ' * '
-#: templates.mdwn:37
-msgid "Really 8 and a half."
+"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 as out the page is edited."
msgstr ""
#. type: Plain text
-#: templates.mdwn:39
+#: templates.mdwn:36
#, no-wrap
-msgid "## Creating a template\n"
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:45
msgid ""
-"To create a template, simply add a template directive to a page, and the "
-"page will provide a link that can be used to create the template. The "
-"template is a regular wiki page, located in the `templates/` subdirectory "
-"inside the source directory of the wiki."
+"[[!if test=\"(enabled(template) or enabled(edittemplate))\n"
+"and enabled(inline)\" then=\"\"\"\n"
msgstr ""
#. type: Plain text
-#: templates.mdwn:50
-msgid ""
-"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
-"module, which allows for some fairly complex things to be done. Consult its "
-"documentation for the full syntax, but all you really need to know are a few "
-"things:"
-msgstr ""
-
-#. type: Bullet: '* '
-#: templates.mdwn:62
-msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-
-#. type: Bullet: '* '
-#: templates.mdwn:62
+#: templates.mdwn:40
+#, no-wrap
msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
+"[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and "
+"!*/discussion\"\n"
+"feeds=no archive=yes sort=title template=titlepage\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
msgstr ""
-#. type: Bullet: '* '
-#: templates.mdwn:62
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
+#. type: Title ##
+#: templates.mdwn:42
+#, no-wrap
+msgid "wiki templates"
msgstr ""
-#. type: Bullet: '* '
-#: templates.mdwn:62
+#. type: Plain text
+#: templates.mdwn:46
msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
msgstr ""
#. type: Bullet: '* '
-#: templates.mdwn:62
+#: templates.mdwn:48
msgid ""
-"To use one block of text if a variable is set and a second if it's not, use "
-"`<TMPL_IF NAME=\"variable\">text<TMPL_ELSE>other text</TMPL_IF>`"
+"`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
msgstr ""
#. type: Plain text
-#: templates.mdwn:64
-msgid "Here's a sample template:"
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:78
+#: templates.mdwn:79
#, no-wrap
msgid ""
-" <span class=\"infobox\">\n"
-" Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
-" Age: <TMPL_VAR age><br />\n"
-" <TMPL_IF NAME=\"color\">\n"
-" Favorite color: <TMPL_VAR color><br />\n"
-" <TMPL_ELSE>\n"
-" No favorite color.<br />\n"
-" </TMPL_IF>\n"
-" <TMPL_IF NAME=\"notes\">\n"
-" <hr />\n"
-" <TMPL_VAR notes>\n"
-" </TMPL_IF>\n"
-" </span>\n"
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:83
-msgid ""
-"The filled out template will be formatted the same as the rest of the page "
-"that contains it, so you can include WikiLinks and all other forms of wiki "
-"markup in the template. Note though that such WikiLinks will not show up as "
-"backlinks to the page that uses the template."
-msgstr ""
-
-#. type: Plain text
-#: templates.mdwn:87
-msgid ""
-"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This "
-"ensures that if the name contains something that might be mistaken for wiki "
-"markup, it's not converted to html before being processed as a "
-"[[ikiwiki/WikiLink]]."
+" (The [[!iki ikiwiki/directive/pagetemplate desc=\"pagetemplate "
+"directive\"]]\n"
+" can be used to make a page use a different template than "
+"`page.tmpl`.)\"\"\"]]\n"
+"* `rsspage.tmpl` - Used for generating rss feeds for blogs.\n"
+"* `rssitem.tmpl` - Used for generating individual items on rss feeds.\n"
+"* `atompage.tmpl` - Used for generating atom feeds for blogs.\n"
+"* `atomitem.tmpl` - Used for generating individual items on atom feeds.\n"
+"* `inlinepage.tmpl` - Used for displaying a post in a blog.\n"
+"* `archivepage.tmpl` - Used for listing a page in a blog archive page.\n"
+"* `titlepage.tmpl` - Used for listing a page by title in a blog archive "
+"page.\n"
+"* `microblog.tmpl` - Used for showing a microblogging post inline.\n"
+"* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom "
+"links)\n"
+"* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not "
+"used.\n"
+"* `aggregatepost.tmpl` - Used by the aggregate plugin to create\n"
+" a page for a post.\n"
+"* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin \n"
+" and google plugin to add search forms to wiki pages.\n"
+"* `searchquery.tmpl` - This is a Omega template, used by the\n"
+" search plugin.\n"
+"* `comment.tmpl` - Used by the comments plugin to display a comment.\n"
+"* `change.tmpl` - Used to create a page describing a change made to the "
+"wiki.\n"
+"* `recentchanges.tmpl` - Used for listing a change on the RecentChanges "
+"page.\n"
+"* `autoindex.tmpl` - Filled in by the autoindex plugin to make index "
+"pages.\n"
+"* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.\n"
+"* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to\n"
+" make calendar archive pages.\n"
+"* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
+" `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
+" `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
+" `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
+" interface; do not normally need to be customised.\n"
msgstr ""
#. type: Plain text
@@ -1664,7 +1572,7 @@ msgid ""
"<div class=\"notebox\">\n"
"<TMPL_VAR text>\n"
"</div>\n"
-"<TMPL_UNLESS NAME=\"text\">\n"
+"<TMPL_UNLESS text>\n"
"Use this template to insert a note into a page. The note will be styled to\n"
"float to the right of other text on the page. This template has one\n"
"parameter:\n"
@@ -1678,7 +1586,7 @@ msgstr ""
#: templates/popup.mdwn:16
#, no-wrap
msgid ""
-"<TMPL_UNLESS NAME=\"mouseover\">\n"
+"<TMPL_UNLESS mouseover>\n"
"Use this template to create a popup window that is displayed when the "
"mouse\n"
"is over part of the page. This template has two parameters:\n"
diff --git a/po/directives.pot b/po/directives.pot
index 2d69710..c3883e8 100644
--- a/po/directives.pot
+++ b/po/directives.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ikiwiki directives 2.62.1\n"
-"POT-Creation-Date: 2009-05-25 23:07+0300\n"
+"POT-Creation-Date: 2010-07-15 19: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"
@@ -62,60 +62,69 @@ msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/aggregate.mdwn:22 ikiwiki/directive/calendar.mdwn:26 ikiwiki/directive/img.mdwn:8 ikiwiki/directive/inline.mdwn:41 ikiwiki/directive/table.mdwn:32
+#: ikiwiki/directive/aggregate.mdwn:26
+msgid ""
+"Note the use of `internal()` in the [[ikiwiki/PageSpec]] to match aggregated "
+"pages. By default, aggregated pages are internal pages, which prevents them "
+"from showing up directly in the wiki, and so this special [[PageSpec]] is "
+"needed to match them."
+msgstr ""
+
+#. type: Title ##
+#: ikiwiki/directive/aggregate.mdwn:27 ikiwiki/directive/calendar.mdwn:37 ikiwiki/directive/comment.mdwn:17 ikiwiki/directive/img.mdwn:8 ikiwiki/directive/inline.mdwn:41 ikiwiki/directive/postsparkline.mdwn:16 ikiwiki/directive/sparkline.mdwn:24 ikiwiki/directive/table.mdwn:32
#, no-wrap
-msgid "## usage\n"
+msgid "usage"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/aggregate.mdwn:26
+#: ikiwiki/directive/aggregate.mdwn:31
msgid ""
"Here are descriptions of all the supported parameters to the `aggregate` "
"directive:"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid "`name` - A name for the feed. Each feed must have a unique name. Required."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`url` - The url to the web page for the feed that's being aggregated. "
"Required."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`dir` - The directory in the wiki where pages should be saved. Optional, if "
"not specified, the directory is based on the name of the feed."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`feedurl` - The url to the feed. Optional, if it's not specified ikiwiki "
"will look for feeds on the `url`. RSS and atom feeds are supported."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`updateinterval` - How often to check for new posts, in minutes. Default is "
"15 minutes."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`expireage` - Expire old items from this feed if they are older than a "
"specified number of days. Default is to never expire on age."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`expirecount` - Expire old items from this feed if there are more than the "
"specified number total. Oldest items will be expired first. Default is to "
@@ -123,7 +132,7 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`tag` - A tag to tag each post from the feed with. A good tag to use is the "
"name of the feed. Can be repeated multiple times. The [[tag]] plugin must be "
@@ -131,14 +140,14 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/aggregate.mdwn:47
+#: ikiwiki/directive/aggregate.mdwn:52
msgid ""
"`template` - Template to use for creating the aggregated pages. Defaults to "
"aggregatepost."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/aggregate.mdwn:51
+#: ikiwiki/directive/aggregate.mdwn:56
msgid ""
"Note that even if you are using subversion or another revision control "
"system, pages created by aggregation will *not* be checked into revision "
@@ -146,7 +155,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/aggregate.mdwn:52 ikiwiki/directive/brokenlinks.mdwn:14 ikiwiki/directive/calendar.mdwn:46 ikiwiki/directive/color.mdwn:25 ikiwiki/directive/copy.mdwn:3 ikiwiki/directive/cut.mdwn:3 ikiwiki/directive/cutpaste.mdwn:50 ikiwiki/directive/edittemplate.mdwn:36 ikiwiki/directive/fortune.mdwn:8 ikiwiki/directive/graph.mdwn:23 ikiwiki/directive/haiku.mdwn:15 ikiwiki/directive/if.mdwn:48 ikiwiki/directive/img.mdwn:38 ikiwiki/directive/inline.mdwn:106 ikiwiki/directive/linkmap.mdwn:24 ikiwiki/directive/listdirectives.mdwn:20 ikiwiki/directive/map.mdwn:19 ikiwiki/directive/meta.mdwn:147 ikiwiki/directive/more.mdwn:16 ikiwiki/directive/orphans.mdwn:15 ikiwiki/directive/pagecount.mdwn:10 ikiwiki/directive/pagestats.mdwn:15 ikiwiki/directive/pagetemplate.mdwn:15 ikiwiki/directive/paste.mdwn:3 ikiwiki/directive/ping.mdwn:18 ikiwiki/directive/poll.mdwn:25 ikiwiki/directive/polygen.mdwn:11 ikiwiki/directive/postsparkline.mdwn:45 ikiwiki/directive/progress.mdwn:18 ikiwiki/directive/shortcut.mdwn:9 ikiwiki/directive/sparkline.mdwn:52 ikiwiki/directive/table.mdwn:45 ikiwiki/directive/tag.mdwn:30 ikiwiki/directive/taglink.mdwn:3 ikiwiki/directive/template.mdwn:18 ikiwiki/directive/testpagespec.mdwn:24 ikiwiki/directive/teximg.mdwn:23 ikiwiki/directive/toc.mdwn:21 ikiwiki/directive/toggle.mdwn:34 ikiwiki/directive/toggleable.mdwn:3 ikiwiki/directive/version.mdwn:12
+#: ikiwiki/directive/aggregate.mdwn:57 ikiwiki/directive/brokenlinks.mdwn:14 ikiwiki/directive/calendar.mdwn:60 ikiwiki/directive/color.mdwn:25 ikiwiki/directive/comment.mdwn:40 ikiwiki/directive/copy.mdwn:3 ikiwiki/directive/cut.mdwn:3 ikiwiki/directive/cutpaste.mdwn:50 ikiwiki/directive/date.mdwn:16 ikiwiki/directive/edittemplate.mdwn:36 ikiwiki/directive/format.mdwn:29 ikiwiki/directive/fortune.mdwn:8 ikiwiki/directive/graph.mdwn:23 ikiwiki/directive/haiku.mdwn:15 ikiwiki/directive/if.mdwn:48 ikiwiki/directive/img.mdwn:39 ikiwiki/directive/inline.mdwn:118 ikiwiki/directive/linkmap.mdwn:29 ikiwiki/directive/listdirectives.mdwn:20 ikiwiki/directive/map.mdwn:21 ikiwiki/directive/meta.mdwn:173 ikiwiki/directive/more.mdwn:16 ikiwiki/directive/orphans.mdwn:15 ikiwiki/directive/pagecount.mdwn:10 ikiwiki/directive/pagestats.mdwn:40 ikiwiki/directive/pagetemplate.mdwn:13 ikiwiki/directive/paste.mdwn:3 ikiwiki/directive/ping.mdwn:18 ikiwiki/directive/poll.mdwn:25 ikiwiki/directive/polygen.mdwn:11 ikiwiki/directive/postsparkline.mdwn:45 ikiwiki/directive/progress.mdwn:18 ikiwiki/directive/shortcut.mdwn:9 ikiwiki/directive/sidebar.mdwn:20 ikiwiki/directive/sparkline.mdwn:52 ikiwiki/directive/table.mdwn:50 ikiwiki/directive/tag.mdwn:35 ikiwiki/directive/taglink.mdwn:3 ikiwiki/directive/template.mdwn:87 ikiwiki/directive/testpagespec.mdwn:24 ikiwiki/directive/teximg.mdwn:23 ikiwiki/directive/toc.mdwn:27 ikiwiki/directive/toggle.mdwn:34 ikiwiki/directive/toggleable.mdwn:3 ikiwiki/directive/version.mdwn:12
#, no-wrap
msgid "[[!meta robots=\"noindex, follow\"]]\n"
msgstr ""
@@ -174,7 +183,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/brokenlinks.mdwn:11 ikiwiki/directive/inline.mdwn:7 ikiwiki/directive/template.mdwn:9
+#: ikiwiki/directive/brokenlinks.mdwn:11 ikiwiki/directive/comment.mdwn:7 ikiwiki/directive/inline.mdwn:7
msgid "Example:"
msgstr ""
@@ -185,104 +194,132 @@ msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:3
+#: ikiwiki/directive/calendar.mdwn:2
msgid ""
"The `calendar` directive is supplied by the [[!iki plugins/calendar "
-"desc=calendar]] plugin. This plugin requires extra setup. See the plugin "
-"documentation for details."
+"desc=calendar]] plugin."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:6
+#: ikiwiki/directive/calendar.mdwn:5
msgid ""
"This directive displays a calendar, similar to the typical calendars shown "
"on some blogs."
msgstr ""
-#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:7 ikiwiki/directive/postsparkline.mdwn:6 ikiwiki/directive/sparkline.mdwn:7
+#. type: Title ##
+#: ikiwiki/directive/calendar.mdwn:6 ikiwiki/directive/color.mdwn:9 ikiwiki/directive/postsparkline.mdwn:6 ikiwiki/directive/sidebar.mdwn:10 ikiwiki/directive/sparkline.mdwn:7 ikiwiki/directive/table.mdwn:6 ikiwiki/directive/teximg.mdwn:5
#, no-wrap
-msgid "# examples\n"
+msgid "examples"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:10
+#: ikiwiki/directive/calendar.mdwn:9
#, no-wrap
msgid "\t\\[[!calendar ]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:12
+#: ikiwiki/directive/calendar.mdwn:11
#, no-wrap
msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:14
+#: ikiwiki/directive/calendar.mdwn:13
#, no-wrap
msgid ""
"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
"!*/Discussion\"]]\n"
msgstr ""
+#. type: Title ##
+#: ikiwiki/directive/calendar.mdwn:14
+#, no-wrap
+msgid "setup"
+msgstr ""
+
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:18
+#: ikiwiki/directive/calendar.mdwn:22
msgid ""
"The calendar is essentially a fancy front end to archives of previous pages, "
"usually used for blogs. It can produce a calendar for a given month, or a "
-"list of months for a given year."
+"list of months for a given year. The month format calendar simply links to "
+"any page posted on each day of the month. The year format calendar links to "
+"archive pages, with names like `archives/2007` (for all of 2007) and "
+"`archives/2007/01` (for January, 2007)."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/calendar.mdwn:25
+#: ikiwiki/directive/calendar.mdwn:27
msgid ""
-"The month format calendar simply links to any page posted on each day of the "
-"month. The year format calendar links to archive pages, with names like "
-"`archives/2007` (for all of 2007) and `archives/2007/01` (for January, "
-"2007). For this to work, you'll need to create these archive pages. They "
-"typically use [[inline]] to display or list pages created in the given time "
-"frame."
+"While you can insert calendar directives anywhere on your wiki, including in "
+"the sidebar, you'll also need to create these archive pages. They typically "
+"use this directive to display a calendar, and also use [[inline]] to display "
+"or list pages created in the given time frame."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/calendar.mdwn:32
+msgid ""
+"The `ikiwiki-calendar` command can be used to automatically generate the "
+"archive pages. It also refreshes the wiki, updating the calendars to "
+"highlight the current day. This command is typically run at midnight from "
+"cron. An example crontab:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/calendar.mdwn:34
+msgid "An example crontab:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/calendar.mdwn:36
+#, no-wrap
+msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
"`type` - Used to specify the type of calendar wanted. Can be one of "
"\"month\" or \"year\". The default is a month view calendar."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the "
"month calendar. Defaults to \"*\"."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
-"`archivebase` - Configures the base of the archives hierarchy. The default "
+"`archivebase` - Configures the base of the archives hierarchy. The default "
"is \"archives\". Note that this default can also be overridden for the whole "
-"wiki by setting `archivebase` in ikiwiki's setup file."
+"wiki by setting `archivebase` in ikiwiki's setup file. Calendars link to "
+"pages under here, with names like \"2010/04\" and \"2010\". These pages can "
+"be automatically created using the `ikiwiki-calendar` program."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
"`year` - The year for which the calendar is requested. Defaults to the "
-"current year."
+"current year. Can also use -1 to refer to last year, and so on."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
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 "
-"current month."
+"current month. Can also use -1 to refer to last month, and so on."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
"`week_start_day` - A number, in the range 0..6, which represents the day of "
"the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
@@ -290,9 +327,9 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/calendar.mdwn:45
+#: ikiwiki/directive/calendar.mdwn:59
msgid ""
-"`months_per_row` - In the annual calendar, number of months to place in each "
+"`months_per_row` - In the year calendar, number of months to place in each "
"row. Defaults to 3."
msgstr ""
@@ -318,12 +355,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/color.mdwn:9 ikiwiki/directive/table.mdwn:6 ikiwiki/directive/teximg.mdwn:5
-#, no-wrap
-msgid "## examples\n"
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/directive/color.mdwn:13
msgid ""
"Here the foreground color is defined as a word, while the background color "
@@ -367,6 +398,100 @@ msgid ""
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/comment.mdwn:5
+msgid ""
+"The `comment` directive is supplied by the [[!iki plugins/comments "
+"desc=comments]] plugin, and is used to add a comment to a page. Typically, "
+"the directive is the only thing on a comment page, and is filled out by the "
+"comment plugin when a user posts a comment."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/comment.mdwn:12
+#, no-wrap
+msgid ""
+"\t\\[[!comment format=mdwn\n"
+"\tusername=\"foo\"\n"
+"\tsubject=\"Bar\"\n"
+"\tdate=\"2009-06-02T19:05:01Z\"\n"
+"\tcontent=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/comment.mdwn:14
+#, no-wrap
+msgid ""
+"\tBlah blah.\n"
+"\t\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/comment.mdwn:16
+#, no-wrap
+msgid "\t]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/comment.mdwn:21
+msgid ""
+"The only required parameter is `content`, the others just add or override "
+"metadata of the comment."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`content` - Text to display for the comment. Note that "
+"[[directives|ikiwiki/directive]] may not be allowed, depending on the "
+"configuration of the comment plugin."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid "`format` - Specifies the markup used for the content."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid "`subject` - Subject for the comment."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`date` - Date the comment was posted. Can be entered in nearly any format, "
+"since it's parsed by [[!cpan TimeDate]]"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`username` - Used to record the username (or OpenID) of a logged in "
+"commenter."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`nickname` - Name to display for a logged in commenter. (Optional; used for "
+"OpenIDs.)"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`ip` - Can be used to record the IP address of a commenter, if they posted "
+"anonymously."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/comment.mdwn:39
+msgid ""
+"`claimedauthor` - Records the name that the user entered, if anonymous "
+"commenters are allowed to enter their (unverified) name."
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/copy.mdwn:1 ikiwiki/directive/cut.mdwn:1 ikiwiki/directive/paste.mdwn:1
#, no-wrap
msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
@@ -423,15 +548,15 @@ msgstr ""
#: ikiwiki/directive/cutpaste.mdwn:23
#, no-wrap
msgid ""
-"\t\\[[!toggleable id=\"cut\" text=\"\\[[!paste id=cutlongdesc]]\"]]\n"
-"\t\\[[!toggleable id=\"copy\" text=\"\\[[!paste id=copylongdesc]]\"]]\n"
-"\t\\[[!toggleable id=\"paste\" text=\"\\[[!paste id=pastelongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=cutlongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=copylongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=pastelongdesc]]\"]]\n"
msgstr ""
#. type: Plain text
#: ikiwiki/directive/cutpaste.mdwn:25
#, no-wrap
-msgid "\t\\[...some time later...]\n"
+msgid "\t[...some time later...]\n"
msgstr ""
#. type: Plain text
@@ -481,7 +606,7 @@ msgstr ""
#. type: Plain text
#: ikiwiki/directive/cutpaste.mdwn:44
#, no-wrap
-msgid "\t \\[[!toggleable id=bar text=\"\\[[!paste id=baz]]\"]]\n"
+msgid "\t [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n"
msgstr ""
#. type: Plain text
@@ -497,6 +622,42 @@ msgid "\tmultiline parameter!\n"
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/date.mdwn:2
+msgid ""
+"The `date` directive is supplied by the [[!iki plugins/date desc=date]] "
+"plugin."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/date.mdwn:7
+msgid ""
+"This directive can be used to display a date on a page, using the same "
+"display method that is used to display the modification date in the page "
+"footer, and other dates in the wiki. This can be useful for consistency of "
+"display, or if you want to embed parseable dates into the page source."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/date.mdwn:10
+msgid ""
+"Like the dates used by the [[meta]] directive, the date can be entered in "
+"nearly any format, since it's parsed by [[!cpan TimeDate]]."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/date.mdwn:13
+msgid ""
+"For example, an update to a page with an embedded date stamp could look "
+"like:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/date.mdwn:15
+#, no-wrap
+msgid "\tUpdated \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: mumble mumble\n"
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/edittemplate.mdwn:2
msgid ""
"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate "
@@ -550,18 +711,12 @@ msgstr ""
#, 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"
+"like other ikiwiki [[templates]]. Currently only one variable is\n"
"set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
"created.\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/edittemplate.mdwn:28
-#, no-wrap
-msgid "----\n"
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/directive/edittemplate.mdwn:35
msgid ""
"It's generally not a good idea to put the `edittemplate` directive in the "
@@ -572,6 +727,67 @@ msgid ""
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/format.mdwn:3
+msgid ""
+"The `format` directive is supplied by the [[!iki plugins/format "
+"desc=format]] plugin."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:8
+msgid ""
+"The directive allows formatting a chunk of text using any available page "
+"format. It takes two parameters. First is the type of format to use, ie the "
+"extension that would be used for a standalone file of this type. Second is "
+"the text to format."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:11
+msgid ""
+"For example, this will embed an otl outline inside a page using mdwn or some "
+"other format:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:12
+#, no-wrap
+msgid "\t\\[[!format otl \"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:19
+#, no-wrap
+msgid ""
+"\tfoo\n"
+"\t\t1\n"
+"\t\t2\n"
+"\tbar\n"
+"\t\t3\n"
+"\t\t4\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:24
+msgid ""
+"Note that if the highlight plugin is enabled, this directive can also be "
+"used to display syntax highlighted code. Many languages and formats are "
+"supported. For example:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:25
+#, no-wrap
+msgid "\t\\[[!format perl \"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/format.mdwn:27
+#, no-wrap
+msgid "\tprint \"hello, world\\n\";\n"
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/fortune.mdwn:2
msgid ""
"The `fortune` directive is supplied by the [[!iki plugins/fortune "
@@ -835,31 +1051,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/img.mdwn:24
+#: ikiwiki/directive/img.mdwn:25
msgid ""
-"You can also pass `alt`, `title`, `class` and `id` 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."
+"You can also pass `alt`, `title`, `class`, `align`, `id`, `hspace`, and "
+"`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 ""
#. type: Plain text
-#: ikiwiki/directive/img.mdwn:29
+#: ikiwiki/directive/img.mdwn:30
msgid ""
-"The `link` parameter is used to control whether the scaled down image links "
-"to the full size version. By default it does; set \"link=somepage\" to link "
-"to another page instead, or \"link=no\" to disable the link, or "
+"The `link` parameter is used to control whether the scaled image links to "
+"the full size version. By default it does; set \"link=somepage\" to link to "
+"another page instead, or \"link=no\" to disable the link, or "
"\"link=http://url\" to link to a given url."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/img.mdwn:32
+#: ikiwiki/directive/img.mdwn:33
msgid ""
"You can also set default values that will be applied to all later images on "
"the page, unless overridden. Useful when including many images on a page."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/img.mdwn:37
+#: ikiwiki/directive/img.mdwn:38
#, no-wrap
msgid ""
"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n"
@@ -1014,7 +1231,7 @@ msgstr ""
#. type: Bullet: '* '
#: ikiwiki/directive/inline.mdwn:62
msgid ""
-"`rootpage` - Enable the postform, and allows controling where newly posted "
+"`rootpage` - Enables the postform, and allows controling where newly posted "
"pages should go, by specifiying the page that they should be a [[SubPage]] "
"of."
msgstr ""
@@ -1025,7 +1242,7 @@ msgid "Here are some less often needed parameters:"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
"for editing and discussion (if they would be shown at the top of the page "
@@ -1033,7 +1250,7 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`rss` - controls generation of an rss feed. If the wiki is configured to "
"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
@@ -1041,7 +1258,7 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`atom` - controls generation of an atom feed. If the wiki is configured to "
"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
@@ -1049,25 +1266,33 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
"disable generating any feeds."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
+msgid ""
+"`emptyfeeds` - Set to \"no\" to disable generation of empty feeds. Has no "
+"effect if `rootpage` or `postform` is set."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`template` - Specifies the template to fill out to display each inlined "
"page. By default the `inlinepage` template is used, while the `archivepage` "
"template is used for archives. Set this parameter to use some other, custom "
-"template, such as the `titlepage` template that only shows post titles. Note "
-"that you should still set `archive=yes` if your custom template does not "
-"include the page content."
+"template, such as the `titlepage` template that only shows post titles or "
+"the `microblog` template, optimised for microblogging. Note that you should "
+"still set `archive=yes` if your custom template does not include the page "
+"content."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`raw` - Rather than the default behavior of creating a blog, if raw is set "
"to \"yes\", the page will be included raw, without additional markup around "
@@ -1075,65 +1300,84 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first."
+"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]]. The "
+"default is to sort the newest created pages first."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`feedshow` - Specify the maximum number of matching pages to include in the "
"rss/atom feeds. The default is the same as the `show` value above."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`feedonly` - Only generate the feed, do not display the pages inline on the "
"page."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
+"metadata. This also turns off generation of any feeds."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`timeformat` - Use this to specify how to display the time or date for pages "
"in the blog. The format string is passed to the strftime(3) function."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
"feeds. The default is the same as the `pages` value above, and only pages "
-"matches by that value are included, but some of those can be excluded by "
+"matched by that value are included, but some of those can be excluded by "
"specifying a tighter [[PageSpec]] here."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/inline.mdwn:105
+#: ikiwiki/directive/inline.mdwn:117
msgid ""
"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
"the Atom feed will have this as its `<id>`. The default is to use the URL of "
"the page containing the `inline` directive."
msgstr ""
+#. type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:117
+msgid ""
+"`feedfile` - Can be used to change the name of the file generated for the "
+"feed. This is particularly useful if a page contains multiple feeds. For "
+"example, set \"feedfile=feed\" to cause it to generate `page/feed.atom` "
+"and/or `page/feed.rss`. This option is not supported if the wiki is "
+"configured not to use `usedirs`."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:117
+msgid ""
+"`pagenames` - If given instead of `pages`, this is interpreted as a "
+"space-separated list of links to pages (with the same "
+"[[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined "
+"in exactly the order given: the `sort` and `pages` parameters cannot be used "
+"in conjunction with this one."
+msgstr ""
+
#. type: Plain text
-#: ikiwiki/directive/inline.mdwn:109
+#: ikiwiki/directive/inline.mdwn:121
msgid ""
"A related directive is the [[ikiwiki/directive/edittemplate]] directive, "
"which allows default text for a new page to be specified."
@@ -1160,37 +1404,51 @@ msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/linkmap.mdwn:15
+#: ikiwiki/directive/linkmap.mdwn:11
msgid ""
"Only links between mapped pages will be shown; links pointing to or from "
"unmapped pages will be omitted. If the pages to include are not specified, "
-"the links between all pages (and other files) in the wiki are mapped. For "
-"best results, only a small set of pages should be mapped, since otherwise "
-"the map can become very large, unweildy, and complicated. Also, the map is "
-"rebuilt whenever one of the mapped pages is changed, which can make the wiki "
-"a bit slow."
+"the links between all pages (and other files) in the wiki are mapped."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/linkmap.mdwn:18
+#: ikiwiki/directive/linkmap.mdwn:14
msgid ""
"Here are descriptions of all the supported parameters to the `linkmap` "
"directive:"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/linkmap.mdwn:23
+#: ikiwiki/directive/linkmap.mdwn:22
msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/linkmap.mdwn:23
+#: ikiwiki/directive/linkmap.mdwn:22
msgid ""
"`height`, `width` - Limit the size of the map to a given height and width, "
"in inches. Both must be specified for the limiting to take effect, otherwise "
"the map's size is not limited."
msgstr ""
+#. type: Bullet: '* '
+#: ikiwiki/directive/linkmap.mdwn:22
+msgid ""
+"`connected` - Controls whether to include pages on the map that link to no "
+"other pages (connected=no, the default), or to only show pages that link to "
+"others (connected=yes)."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:28
+msgid ""
+"For best results, only a small set of pages should be mapped, since "
+"otherwise the map can become very large, unwieldy, and complicated. If too "
+"many pages are included, the map may get so large that graphviz cannot "
+"render it. Using the `connected` parameter is a good way to prune out pages "
+"that clutter the map."
+msgstr ""
+
#. type: Plain text
#: ikiwiki/directive/listdirectives.mdwn:2
msgid ""
@@ -1275,7 +1533,13 @@ msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/map.mdwn:18
+#: ikiwiki/directive/map.mdwn:17
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/map.mdwn:20
msgid ""
"Hint: To limit the map to displaying pages less than a certain level deep, "
"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`"
@@ -1346,13 +1610,33 @@ msgid ""
" differently in this case.\n"
msgstr ""
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:28
+#, no-wrap
+msgid ""
+" An optional `sortas` parameter will be used preferentially when\n"
+" [[ikiwiki/pagespec/sorting]] by `meta(title)`:\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:30
+#, no-wrap
+msgid "\t\\[[!meta title=\"The Beatles\" sortas=\"Beatles, The\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:32
+#, no-wrap
+msgid "\t\\[[!meta title=\"David Bowie\" sortas=\"Bowie, David\"]]\n"
+msgstr ""
+
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:27
+#: ikiwiki/directive/meta.mdwn:34
msgid "license"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:30
+#: ikiwiki/directive/meta.mdwn:37
#, no-wrap
msgid ""
" Specifies a license for the page, for example, \"GPL\". Can contain\n"
@@ -1360,12 +1644,12 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:32
+#: ikiwiki/directive/meta.mdwn:39
msgid "copyright"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:35
+#: ikiwiki/directive/meta.mdwn:42
#, no-wrap
msgid ""
" Specifies the copyright of the page, for example, \"Copyright 2007 by\n"
@@ -1373,47 +1657,61 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:37
+#: ikiwiki/directive/meta.mdwn:44
msgid "author"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:39
+#: ikiwiki/directive/meta.mdwn:46
#, no-wrap
msgid " Specifies the author of a page.\n"
msgstr ""
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:49
+#, no-wrap
+msgid ""
+" An optional `sortas` parameter will be used preferentially when\n"
+" [[ikiwiki/pagespec/sorting]] by `meta(author)`:\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:51
+#, no-wrap
+msgid "\t\\[[!meta author=\"Joey Hess\" sortas=\"Hess, Joey\"]]\n"
+msgstr ""
+
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:41
+#: ikiwiki/directive/meta.mdwn:53
msgid "authorurl"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:43
+#: ikiwiki/directive/meta.mdwn:55
#, no-wrap
msgid " Specifies an url for the author of a page.\n"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:45
+#: ikiwiki/directive/meta.mdwn:57
msgid "description"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:48
+#: ikiwiki/directive/meta.mdwn:60
#, no-wrap
msgid ""
-" Specifies a \"description\" of the page. You could use this to provide\n"
-" a summary, for example, to be picked up by the [[map]] directive.\n"
+" Specifies a short description for the page. This will be put in\n"
+" the html header, and can also be displayed by eg, the [[map]] directive.\n"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:50
+#: ikiwiki/directive/meta.mdwn:62
msgid "permalink"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:53
+#: ikiwiki/directive/meta.mdwn:65
#, no-wrap
msgid ""
" Specifies a permanent link to the page, if different than the page\n"
@@ -1421,12 +1719,12 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:55
+#: ikiwiki/directive/meta.mdwn:67
msgid "date"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:58
+#: ikiwiki/directive/meta.mdwn:70
#, no-wrap
msgid ""
" Specifies the creation date of the page. The date can be entered in\n"
@@ -1434,12 +1732,12 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:60
+#: ikiwiki/directive/meta.mdwn:72
msgid "stylesheet"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:64
+#: ikiwiki/directive/meta.mdwn:76
#, no-wrap
msgid ""
" Adds a stylesheet to a page. The stylesheet is treated as a wiki link to\n"
@@ -1448,7 +1746,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:67
+#: ikiwiki/directive/meta.mdwn:79
#, no-wrap
msgid ""
"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
@@ -1456,28 +1754,43 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:69
+#: ikiwiki/directive/meta.mdwn:81
msgid "openid"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:74
+#: ikiwiki/directive/meta.mdwn:84
#, no-wrap
msgid ""
" Adds html &lt;link&gt; tags to perform OpenID delegation to an external\n"
-" OpenID server (for `openid` and `openid2`). An optional `xrds-location`\n"
+" OpenID server. This lets you use an ikiwiki page as your OpenID.\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:87
+#, no-wrap
+msgid ""
+" By default this will delegate for both `openid` and `openid2`. To only\n"
+" delegate for one, add a parameter such as `delegate=openid`.\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:91
+#, no-wrap
+msgid ""
+" An optional `xrds-location`\n"
" parameter lets you specify the location of any [eXtensible Resource\n"
" DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:76
+#: ikiwiki/directive/meta.mdwn:93
#, no-wrap
-msgid " This lets you use an ikiwiki page as your OpenID. Example:\n"
+msgid " Example:\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:80
+#: ikiwiki/directive/meta.mdwn:97
#, no-wrap
msgid ""
"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
@@ -1486,12 +1799,12 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:82
+#: ikiwiki/directive/meta.mdwn:99
msgid "link"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:86
+#: ikiwiki/directive/meta.mdwn:103
#, no-wrap
msgid ""
" Specifies a link to another page. This can be used as a way to make the\n"
@@ -1501,19 +1814,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:88
+#: ikiwiki/directive/meta.mdwn:105
#, no-wrap
msgid " \\[[!meta link=otherpage]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:90
+#: ikiwiki/directive/meta.mdwn:107
#, no-wrap
msgid " It can also be used to insert a html &lt;link&gt; tag. For example:\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:92
+#: ikiwiki/directive/meta.mdwn:109
#, no-wrap
msgid ""
" \\[[!meta link=\"http://joeyh.myopenid.com/\" "
@@ -1521,7 +1834,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:96 ikiwiki/directive/meta.mdwn:113
+#: ikiwiki/directive/meta.mdwn:113 ikiwiki/directive/meta.mdwn:130
#, no-wrap
msgid ""
" However, this latter syntax won't be allowed if the \n"
@@ -1531,24 +1844,24 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:98
+#: ikiwiki/directive/meta.mdwn:115
msgid "redir"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:100
+#: ikiwiki/directive/meta.mdwn:117
#, no-wrap
msgid " Causes the page to redirect to another page in the wiki.\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:102
+#: ikiwiki/directive/meta.mdwn:119
#, no-wrap
msgid " \t\\[[!meta redir=otherpage]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:105
+#: ikiwiki/directive/meta.mdwn:122
#, no-wrap
msgid ""
" Optionally, a delay (in seconds) can be specified. The default is to\n"
@@ -1556,19 +1869,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:107
+#: ikiwiki/directive/meta.mdwn:124
#, no-wrap
msgid " It can also be used to redirect to an external url. For example:\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:109
+#: ikiwiki/directive/meta.mdwn:126
#, no-wrap
msgid " \t\\[[!meta redir=\"http://example.com/\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:116
+#: ikiwiki/directive/meta.mdwn:133
#, no-wrap
msgid ""
" For both cases, an anchor to jump to inside the destination page may also "
@@ -1577,24 +1890,24 @@ msgid ""
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:118
+#: ikiwiki/directive/meta.mdwn:135
msgid "robots"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:120
+#: ikiwiki/directive/meta.mdwn:137
#, no-wrap
msgid " Causes the robots meta tag to be written:\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:122
+#: ikiwiki/directive/meta.mdwn:139
#, no-wrap
msgid " \\[[!meta robots=\"index, nofollow\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:127
+#: ikiwiki/directive/meta.mdwn:144
#, no-wrap
msgid ""
" Valid values for the attribute are: \"index\", \"noindex\", \"follow\", "
@@ -1606,18 +1919,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:129
+#: ikiwiki/directive/meta.mdwn:146
#, no-wrap
msgid " The value is escaped, but its contents are not otherwise checked.\n"
msgstr ""
#. type: Bullet: '* '
-#: ikiwiki/directive/meta.mdwn:131
+#: ikiwiki/directive/meta.mdwn:148
msgid "guid"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:137
+#: ikiwiki/directive/meta.mdwn:154
#, no-wrap
msgid ""
" Specifies a globally unique ID for a page. This guid should be a URI\n"
@@ -1629,7 +1942,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:141
+#: ikiwiki/directive/meta.mdwn:158
#, no-wrap
msgid ""
" This is mostly useful when a page has moved, to keep the guids for\n"
@@ -1637,8 +1950,27 @@ msgid ""
" (see [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
msgstr ""
+#. type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:160
+msgid "updated"
+msgstr ""
+
#. type: Plain text
-#: ikiwiki/directive/meta.mdwn:146
+#: ikiwiki/directive/meta.mdwn:167
+#, no-wrap
+msgid ""
+" Specifies a fake modification time for a page, to be output into RSS and\n"
+" Atom feeds. This is useful to avoid flooding aggregators that sort by\n"
+" modification time, like Planet: for instance, when editing an old blog "
+"post\n"
+" to add tags, you could set `updated` to be one second later than the "
+"original\n"
+" value. The date/time can be given in any format that\n"
+" [[!cpan TimeDate]] can understand, just like the `date` field.\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/meta.mdwn:172
msgid ""
"If the field is not one of the above predefined fields, the metadata will be "
"written to the generated html page as a &lt;meta&gt; header. However, this "
@@ -1761,28 +2093,91 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/pagestats.mdwn:8
-msgid "Here's how to use it to create a [[tag]] cloud:"
+#: ikiwiki/directive/pagestats.mdwn:9
+msgid ""
+"Here's how to use it to create a [[tag]] cloud, with tags sized based on "
+"frequency of use:"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/pagestats.mdwn:10
+#: ikiwiki/directive/pagestats.mdwn:11
#, no-wrap
msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/pagestats.mdwn:12
+#: ikiwiki/directive/pagestats.mdwn:14
+msgid ""
+"Here's how to create a list of tags, sized by use as they would be in a "
+"cloud."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:16
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"list\" pages=\"tags/*\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:18
msgid "And here's how to create a table of all the pages on the wiki:"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/pagestats.mdwn:14
+#: ikiwiki/directive/pagestats.mdwn:20
#, no-wrap
msgid "\t\\[[!pagestats style=\"table\"]]\n"
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:24
+msgid ""
+"The optional `among` parameter limits the pages whose outgoing links are "
+"considered. For instance, to display a cloud of tags used on blog entries, "
+"while ignoring other pages that use those tags, you could use:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:26
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:28
+msgid "Or to display a cloud of tags related to Linux, you could use:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:30
+#, no-wrap
+msgid ""
+"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" "
+"among=\"tagged(linux)\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:34
+msgid ""
+"The optional `show` parameter limits display to the specified number of "
+"pages. For instance, to show a table of the top ten pages with the most "
+"links:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:36
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:39
+msgid ""
+"The optional `class` parameter can be used to control the class of the "
+"generated tag cloud `div` or page stats `table`."
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/pagetemplate.mdwn:2
msgid ""
"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate "
@@ -1790,9 +2185,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/pagetemplate.mdwn:8
+#: ikiwiki/directive/pagetemplate.mdwn:5
+msgid ""
+"This directive allows a page to be displayed using a different "
+"[[template|templates]] than the default `page.tmpl` template."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/pagetemplate.mdwn:10
msgid ""
-"This directive allows a page to be created using a different wikitemplates. "
"The page text is inserted into the template, so the template controls the "
"overall look and feel of the wiki page. This is in contrast to the "
"[[ikiwiki/directive/template]] directive, which allows inserting templates "
@@ -1801,14 +2202,6 @@ msgstr ""
#. type: Plain text
#: ikiwiki/directive/pagetemplate.mdwn:12
-msgid ""
-"This directive can only reference templates that are already installed by "
-"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
-"directory. Example:"
-msgstr ""
-
-#. type: Plain text
-#: ikiwiki/directive/pagetemplate.mdwn:14
#, no-wrap
msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
msgstr ""
@@ -1972,15 +2365,9 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/postsparkline.mdwn:16 ikiwiki/directive/sparkline.mdwn:24
-#, no-wrap
-msgid "# usage\n"
-msgstr ""
-
-#. type: Plain text
#: ikiwiki/directive/postsparkline.mdwn:20
msgid ""
-"All options aside fron the `pages`, `max`, `formula`, `time`, and `color` "
+"All options aside from the `pages`, `max`, `formula`, `time`, and `color` "
"options are the same as in [[sparkline]] directive."
msgstr ""
@@ -1997,7 +2384,7 @@ msgstr ""
#: ikiwiki/directive/postsparkline.mdwn:28
msgid ""
"The `formula` parameter controls the formula used to generate data points. "
-"Available forumlae:"
+"Available formulae:"
msgstr ""
#. type: Bullet: '* '
@@ -2024,15 +2411,15 @@ msgstr ""
#. type: Bullet: '* '
#: ikiwiki/directive/postsparkline.mdwn:37
msgid ""
-"`peryear` - Each point represents a day; the height represents how many "
+"`peryear` - Each point represents a year; the height represents how many "
"posts were made that year."
msgstr ""
#. type: Plain text
#: ikiwiki/directive/postsparkline.mdwn:41
msgid ""
-"The `time` parameter has a default value of \"ctime\", since forumae use the "
-"creation times of pages by default. If you instead want them to use the "
+"The `time` parameter has a default value of \"ctime\", since formulae use "
+"the creation times of pages by default. If you instead want them to use the "
"modification times of pages, set it to \"mtime\"."
msgstr ""
@@ -2106,6 +2493,52 @@ msgid ""
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:2
+msgid ""
+"The `sidebar` directive is supplied by the [[!iki plugins/sidebar "
+"desc=sidebar]] plugin."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:5
+msgid ""
+"This directive can specify a custom sidebar to display on the page, "
+"overriding any sidebar that is displayed globally."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:9
+msgid ""
+"If no custom sidebar content is specified, it forces the sidebar page to be "
+"used as the sidebar, even if the `global_sidebars` setting has been used to "
+"disable use of the sidebar page by default."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:12
+#, no-wrap
+msgid "\t\\[[!sidebar content=\"\"\"\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:14
+#, no-wrap
+msgid "\tThis is my custom sidebar for this page.\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:16
+#, no-wrap
+msgid "\t\\[[!calendar pages=\"posts/*\"]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/sidebar.mdwn:19
+#, no-wrap
+msgid "\t\\[[!sidebar]]\n"
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/sparkline.mdwn:2
msgid ""
"The `sparkline` directive is supplied by the [[!iki plugins/sparkline "
@@ -2116,7 +2549,7 @@ msgstr ""
#: ikiwiki/directive/sparkline.mdwn:6
msgid ""
"This directive allows for embedding sparklines into wiki pages. A sparkline "
-"is a small word-size graphic chart, that is designed to be displayes "
+"is a small word-size graphic chart, that is designed to be displayed "
"alongside text."
msgstr ""
@@ -2253,8 +2686,8 @@ msgstr ""
#: ikiwiki/directive/table.mdwn:13
#, no-wrap
msgid ""
-"\tCustomer|Amount\n"
-"\tFulanito|134,34\n"
+"\tCustomer |Amount\n"
+"\tFulanito |134,34\n"
"\tMenganito|234,56\n"
"\tMenganito|234,56\n"
msgstr ""
@@ -2328,6 +2761,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: ikiwiki/directive/table.mdwn:49
+msgid ""
+"For tab-delimited tables (often obtained by copying and pasting from HTML or "
+"a spreadsheet), `delimiter` must be set to a literal tab character. These "
+"are difficult to type in most web browsers - copying and pasting one from "
+"the table data is likely to be the easiest way."
+msgstr ""
+
+#. type: Plain text
#: ikiwiki/directive/tag.mdwn:2
msgid ""
"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag "
@@ -2371,26 +2813,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/tag.mdwn:23
+#: ikiwiki/directive/tag.mdwn:24
msgid ""
"Note that if the wiki is configured to use a tagbase, then the tags will be "
"located under a base directory, such as \"tags/\". This is a useful way to "
"avoid having to write the full path to tags, if you want to keep them "
-"grouped together out of the way."
+"grouped together out of the way. Also, since ikiwiki then knows where to put "
+"tags, it will automatically create tag pages when new tags are used."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/tag.mdwn:28
+msgid ""
+"Bear in mind that specifying a tagbase means you will need to incorporate it "
+"into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is "
+"`tag`, you would match pages tagged \"foo\" with `link(tag/foo)`."
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/tag.mdwn:26
+#: ikiwiki/directive/tag.mdwn:31
msgid ""
"If you want to override the tagbase for a particular tag, you can use "
"something like this:"
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/tag.mdwn:29
+#: ikiwiki/directive/tag.mdwn:34
#, no-wrap
msgid ""
-"\t\\[[!tag ./foo]]\n"
+"\t\\[[!tag /foo]]\n"
"\t\\[[!taglink /foo]]\n"
msgstr ""
@@ -2410,14 +2861,27 @@ msgstr ""
#. type: Plain text
#: ikiwiki/directive/template.mdwn:7
msgid ""
-"[[Templates]] are files that can be filled out and inserted into pages in "
-"the wiki, by using the template directive. The directive has an `id` "
-"parameter that identifies the template to use. The remaining parameters are "
-"used to fill out the template."
+"The template directive allows wiki pages to be used as templates. These "
+"templates can be filled out and inserted into other pages in the wiki using "
+"the directive. The [[templates]] page lists templates that can be used with "
+"this directive."
msgstr ""
#. type: Plain text
#: ikiwiki/directive/template.mdwn:11
+msgid ""
+"The directive has an `id` parameter that identifies the template to use. The "
+"remaining parameters are used to fill out the template."
+msgstr ""
+
+#. type: Title ##
+#: ikiwiki/directive/template.mdwn:12
+#, no-wrap
+msgid "Example"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:15
#, no-wrap
msgid ""
"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
@@ -2425,17 +2889,156 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ikiwiki/directive/template.mdwn:14
+#: ikiwiki/directive/template.mdwn:18
msgid ""
"This fills out the `note` template, filling in the `text` field with the "
"specified value, and inserts the result into the page."
msgstr ""
+#. type: Title ##
+#: ikiwiki/directive/template.mdwn:19
+#, no-wrap
+msgid "Using a template"
+msgstr ""
+
#. type: Plain text
-#: ikiwiki/directive/template.mdwn:17
+#: ikiwiki/directive/template.mdwn:25
msgid ""
-"For a list of available templates, and details about how to create more, see "
-"the [[templates]] page."
+"Generally, a value can include any markup that would be allowed in the wiki "
+"page outside the template. Triple-quoting the value even allows quotes to be "
+"included in it. Combined with multi-line quoted values, this allows for "
+"large chunks of marked up text to be embedded into a template:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:26
+#, no-wrap
+msgid ""
+" \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
+"notes=\"\"\"\n"
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ikiwiki/directive/template.mdwn:30
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ikiwiki/directive/template.mdwn:30
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+#. type: Bullet: ' * '
+#: ikiwiki/directive/template.mdwn:30
+msgid "Really 8 and a half."
+msgstr ""
+
+#. type: Title ##
+#: ikiwiki/directive/template.mdwn:32
+#, no-wrap
+msgid "Creating a template"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:36
+msgid ""
+"The template is a regular wiki page, located in the `templates/` "
+"subdirectory inside the source directory of the wiki."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:42
+msgid ""
+"(Alternatively, templates can be stored in a directory outside the wiki, as "
+"files with the extension \".tmpl\". By default, these are searched for in "
+"`/usr/share/ikiwiki/templates`; the `templatedir` setting can be used to "
+"make another directory be searched first.)"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:47
+msgid ""
+"The template uses the syntax used by the [[!cpan HTML::Template]] perl "
+"module, which allows for some fairly complex things to be done. Consult its "
+"documentation for the full syntax, but all you really need to know are a few "
+"things:"
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/template.mdwn:59
+msgid ""
+"Each parameter you pass to the template directive will generate a template "
+"variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/template.mdwn:59
+msgid ""
+"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
+"the value will first be converted to html."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/template.mdwn:59
+msgid ""
+"To insert the raw value of a variable, with wiki markup not yet converted to "
+"html, use `<TMPL_VAR raw_variable>`."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/template.mdwn:59
+msgid ""
+"To make a block of text conditional on a variable being set use `<TMPL_IF "
+"variable>text</TMPL_IF>`."
+msgstr ""
+
+#. type: Bullet: '* '
+#: ikiwiki/directive/template.mdwn:59
+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 ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:61
+msgid "Here's a sample template:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:75
+#, no-wrap
+msgid ""
+" <span class=\"infobox\">\n"
+" Name: \\[[<TMPL_VAR raw_name>]]<br />\n"
+" Age: <TMPL_VAR age><br />\n"
+" <TMPL_IF color>\n"
+" Favorite color: <TMPL_VAR color><br />\n"
+" <TMPL_ELSE>\n"
+" No favorite color.<br />\n"
+" </TMPL_IF>\n"
+" <TMPL_IF notes>\n"
+" <hr />\n"
+" <TMPL_VAR notes>\n"
+" </TMPL_IF>\n"
+" </span>\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:80
+msgid ""
+"The filled out template will be formatted the same as the rest of the page "
+"that contains it, so you can include WikiLinks and all other forms of wiki "
+"markup in the template. Note though that such WikiLinks will not show up as "
+"backlinks to the page that uses the template."
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/template.mdwn:85
+msgid ""
+"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator in "
+"the example above. This ensures that if the name contains something that "
+"might be mistaken for wiki markup, it's not converted to html before being "
+"processed as a [[ikiwiki/WikiLink]]."
msgstr ""
#. type: Plain text
@@ -2534,7 +3137,7 @@ msgstr ""
#. type: Plain text
#: ikiwiki/directive/teximg.mdwn:18
msgid ""
-"If no height is choosen the default height 12 is used. Valid heights are: 8, "
+"If no height is chosen the default height 12 is used. Valid heights are: 8, "
"9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest "
"available height is used."
msgstr ""
@@ -2591,6 +3194,20 @@ msgstr ""
#. type: Plain text
#: ikiwiki/directive/toc.mdwn:20
msgid ""
+"To create a table of contents that only shows headers starting with a given "
+"level, use the `startlevel` parameter. For example, to show only h2 and "
+"smaller headers:"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/toc.mdwn:22
+#, no-wrap
+msgid "\t\\[[!toc startlevel=2]]\n"
+msgstr ""
+
+#. type: Plain text
+#: ikiwiki/directive/toc.mdwn:26
+msgid ""
"The table of contents will be created as an ordered list. If you want an "
"unordered list instead, you can change the list-style in your local style "
"sheet."
diff --git a/po/smiley.pot b/po/smiley.pot
index 622416d..ca81d09 100644
--- a/po/smiley.pot
+++ b/po/smiley.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ikiwiki smiley 2.62.1\n"
-"POT-Creation-Date: 2009-05-25 23:07+0300\n"
+"POT-Creation-Date: 2010-07-15 19: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"
@@ -228,12 +228,6 @@ msgid "For example: {x} B) {x}"
msgstr ""
#. type: Plain text
-#: smileys.mdwn:47
-#, no-wrap
-msgid "----\n"
-msgstr ""
-
-#. type: Plain text
#: smileys.mdwn:53
msgid ""
"To change the supported smileys, just edit the lists on this page. Note "
diff --git a/po/templates.pot b/po/templates.pot
index 2676365..33fb0f0 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ikiwiki templates 2.62.1\n"
-"POT-Creation-Date: 2008-10-23 13:26+0300\n"
+"POT-Creation-Date: 2010-07-15 19:34+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 ""