Lightweight comments

[git.ikiwiki.info.git] / po / ikiwiki.pot

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 1dbd77f7a8bc0ee145b7b2b8d771aaadc8e30b9c..7d8255966c6839e6dea41da05ca3a64715b4e126 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-31 14:18-0700\n"
+"POT-Creation-Date: 2020-02-02 20:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,41 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../IkiWiki/CGI.pm:200
+#: ../IkiWiki/CGI.pm:217
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:203
-msgid "login failed, perhaps you need to turn on cookies?"
+#: ../IkiWiki/CGI.pm:220
+msgid ""
+"Login succeeded, but I don't remember why you were logging in, so you'll "
+"have to navigate back to whatever you were doing. (This should not normally "
+"happen. Perhaps you need to enable cookies?)"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:374
+#: ../IkiWiki/CGI.pm:239 ../IkiWiki/CGI.pm:395
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:243
+#: ../IkiWiki/CGI.pm:260
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:244
+#: ../IkiWiki/CGI.pm:261
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:245
+#: ../IkiWiki/CGI.pm:262
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:285
+#: ../IkiWiki/CGI.pm:303
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:337
+#: ../IkiWiki/CGI.pm:358
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:465 ../IkiWiki/CGI.pm:466 ../IkiWiki.pm:1533
+#: ../IkiWiki/CGI.pm:491 ../IkiWiki/CGI.pm:492 ../IkiWiki.pm:1675
 msgid "Error"
 msgstr ""
 
@@ -106,30 +109,30 @@ msgstr ""
 msgid "could not find feed at %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:529
+#: ../IkiWiki/Plugin/aggregate.pm:532
 msgid "feed not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:540
+#: ../IkiWiki/Plugin/aggregate.pm:543
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:548
+#: ../IkiWiki/Plugin/aggregate.pm:551
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:558
+#: ../IkiWiki/Plugin/aggregate.pm:561
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:652
+#: ../IkiWiki/Plugin/aggregate.pm:657
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137
+#: ../IkiWiki/Plugin/aggregate.pm:687 ../IkiWiki/Plugin/edittemplate.pm:137
 msgid "failed to process template:"
 msgstr ""
 
@@ -137,7 +140,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:225
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
 msgid "done"
 msgstr ""
 
@@ -167,19 +170,19 @@ msgstr ""
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:225
+#: ../IkiWiki/Plugin/attachment.pm:235
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:298
+#: ../IkiWiki/Plugin/attachment.pm:308
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:349
+#: ../IkiWiki/Plugin/attachment.pm:359
 msgid "this attachment is not yet saved"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:367
+#: ../IkiWiki/Plugin/attachment.pm:377
 msgid "just uploaded"
 msgstr ""
 
@@ -188,7 +191,7 @@ msgstr ""
 msgid "creating index page %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:119
+#: ../IkiWiki/Plugin/blogspam.pm:131
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
@@ -203,6 +206,21 @@ msgstr ""
 msgid "There are no broken links!"
 msgstr ""
 
+#: ../IkiWiki/Plugin/calendar.pm:115 ../IkiWiki/Plugin/calendar.pm:117
+#, perl-format
+msgid "building calendar for %s, its previous or next year has changed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/calendar.pm:120 ../IkiWiki/Plugin/calendar.pm:122
+#, perl-format
+msgid "building calendar for %s/%s, its previous or next month has changed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/calendar.pm:131
+#, perl-format
+msgid "creating calendar page %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/comments.pm:128
 #, perl-format
 msgid "this comment needs %s"
@@ -221,69 +239,74 @@ msgstr ""
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:221
+#: ../IkiWiki/Plugin/comments.pm:227
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:283
+#: ../IkiWiki/Plugin/comments.pm:285
 msgid "Comment Moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:379 ../IkiWiki/Plugin/comments.pm:383
+#: ../IkiWiki/Plugin/comments.pm:382 ../IkiWiki/Plugin/comments.pm:386
 msgid "email replies to me"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:417 ../IkiWiki/Plugin/editpage.pm:96
+#: ../IkiWiki/Plugin/comments.pm:420 ../IkiWiki/Plugin/editpage.pm:96
 #: ../IkiWiki/Plugin/editpage.pm:102
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:420
+#: ../IkiWiki/Plugin/comments.pm:423
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:437
+#: ../IkiWiki/Plugin/comments.pm:440
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:444
+#: ../IkiWiki/Plugin/comments.pm:450
+#, perl-format
+msgid "comments on page '%s' are not allowed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:457
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:569
+#: ../IkiWiki/Plugin/comments.pm:585
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:571
+#: ../IkiWiki/Plugin/comments.pm:587
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:584
+#: ../IkiWiki/Plugin/comments.pm:600
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:588
+#: ../IkiWiki/Plugin/comments.pm:604
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:658 ../IkiWiki/Plugin/userlist.pm:55
+#: ../IkiWiki/Plugin/comments.pm:678 ../IkiWiki/Plugin/userlist.pm:55
 #: ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:717
+#: ../IkiWiki/Plugin/comments.pm:737
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:758
+#: ../IkiWiki/Plugin/comments.pm:778
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:921
+#: ../IkiWiki/Plugin/comments.pm:943
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -293,7 +316,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:931
+#: ../IkiWiki/Plugin/comments.pm:953
 msgid "Comment"
 msgstr ""
 
@@ -327,14 +350,14 @@ msgstr ""
 msgid "email comments to me"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:319
+#: ../IkiWiki/Plugin/editpage.pm:320
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356
-#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414
-#: ../IkiWiki/Plugin/editpage.pm:456
+#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:357
+#: ../IkiWiki/Plugin/editpage.pm:368 ../IkiWiki/Plugin/editpage.pm:415
+#: ../IkiWiki/Plugin/editpage.pm:457
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -352,6 +375,27 @@ msgstr ""
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
+#: ../IkiWiki/Plugin/emailauth.pm:61
+msgid "Invalid email address."
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:98
+#, perl-format
+msgid "Failed to send mail: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:100
+msgid ""
+"You have been sent an email, with a link you can open to complete the login "
+"process."
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:117
+msgid ""
+"Wrong login token length. Please check that you pasted in the complete login "
+"link from the email!"
+msgstr ""
+
 #: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
@@ -378,26 +422,25 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902
-#: ../IkiWiki.pm:1753
+#: ../IkiWiki/Plugin/git.pm:933 ../IkiWiki/Plugin/git.pm:997 ../IkiWiki.pm:1895
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:861
+#: ../IkiWiki/Plugin/git.pm:955
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:865
+#: ../IkiWiki/Plugin/git.pm:959
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:935
+#: ../IkiWiki/Plugin/git.pm:1033
 msgid "you are not allowed to revert a merge"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:952
+#: ../IkiWiki/Plugin/git.pm:1085 ../IkiWiki/Plugin/git.pm:1104
 #, perl-format
 msgid "Failed to revert commit %s"
 msgstr ""
@@ -411,7 +454,11 @@ msgstr ""
 msgid "failed to run graphviz"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:144
+#: ../IkiWiki/Plugin/graphviz.pm:100 ../IkiWiki/Plugin/table.pm:32
+msgid "cannot find file"
+msgstr ""
+
+#: ../IkiWiki/Plugin/graphviz.pm:152
 msgid "prog not a valid graphviz program"
 msgstr ""
 
@@ -434,26 +481,51 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:70
-msgid "Image::Magick is not installed"
+#: ../IkiWiki/Plugin/img.pm:96
+msgid "Unable to detect image type from extension"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:74 ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:104 ../IkiWiki/Plugin/img.pm:143
+#: ../IkiWiki/Plugin/img.pm:182 ../IkiWiki/Plugin/img.pm:230
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80
+#: ../IkiWiki/Plugin/img.pm:134
+#, perl-format
+msgid "failed to determine format of %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:138
+#, perl-format
+msgid "%s image processing disabled in img_allowed_formats configuration"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:145
+#, perl-format
+msgid "\"%s\" does not seem to be a valid %s file"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:179
+msgid "Image::Magick is not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:191
+#, perl-format
+msgid "failed to get dimensions of %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:198
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:122
+#: ../IkiWiki/Plugin/img.pm:234
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:147
+#: ../IkiWiki/Plugin/img.pm:259
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -462,48 +534,52 @@ msgstr ""
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:139
+#: ../IkiWiki/Plugin/inline.pm:125
+msgid "please enter a page title"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:142
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:156
+#: ../IkiWiki/Plugin/inline.pm:159
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:216
+#: ../IkiWiki/Plugin/inline.pm:231
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:322
+#: ../IkiWiki/Plugin/inline.pm:337
 #, perl-format
 msgid "%s (RSS feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:326
+#: ../IkiWiki/Plugin/inline.pm:341
 #, perl-format
 msgid "%s (Atom feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:355
+#: ../IkiWiki/Plugin/inline.pm:374
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:396 ../IkiWiki/Plugin/template.pm:46
+#: ../IkiWiki/Plugin/inline.pm:415 ../IkiWiki/Plugin/template.pm:46
 #, perl-format
 msgid "failed to process template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:735
+#: ../IkiWiki/Plugin/inline.pm:755
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
-#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95
+#: ../IkiWiki/Plugin/linkmap.pm:94 ../IkiWiki/Plugin/linkmap.pm:101
+#: ../IkiWiki/Plugin/linkmap.pm:105 ../IkiWiki/Plugin/linkmap.pm:108
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:85
+#: ../IkiWiki/Plugin/linkmap.pm:98
 msgid "linkmap"
 msgstr ""
 
@@ -512,11 +588,19 @@ msgstr ""
 msgid "%s is locked and cannot be edited"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:52
+#: ../IkiWiki/Plugin/loginselector.pm:95
+msgid "Other"
+msgstr ""
+
+#: ../IkiWiki/Plugin/loginselector.pm:106
+msgid "Password"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mdwn.pm:74
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:97
+#: ../IkiWiki/Plugin/mdwn.pm:178
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
@@ -525,23 +609,28 @@ msgstr ""
 msgid "enclosure not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:187
+#: ../IkiWiki/Plugin/meta.pm:162 ../IkiWiki/Plugin/meta.pm:177
+#, perl-format
+msgid "cannot parse date/time: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:203
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:199
+#: ../IkiWiki/Plugin/meta.pm:215
 msgid "script not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:247
+#: ../IkiWiki/Plugin/meta.pm:263
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:261
+#: ../IkiWiki/Plugin/meta.pm:277
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:450
+#: ../IkiWiki/Plugin/meta.pm:467
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -573,11 +662,6 @@ msgstr ""
 msgid "comment notification:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:71
-#, perl-format
-msgid "failed to load openid module: "
-msgstr ""
-
 #: ../IkiWiki/Plugin/orphans.pm:56
 msgid "All pages have other pages linking to them."
 msgstr ""
@@ -586,47 +670,47 @@ msgstr ""
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:337
+#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:347
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:297
+#: ../IkiWiki/Plugin/passwordauth.pm:303
 msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:304
+#: ../IkiWiki/Plugin/passwordauth.pm:310
 msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:334
+#: ../IkiWiki/Plugin/passwordauth.pm:344
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:344
+#: ../IkiWiki/Plugin/passwordauth.pm:353
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:371
+#: ../IkiWiki/Plugin/passwordauth.pm:380
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:373
+#: ../IkiWiki/Plugin/passwordauth.pm:382
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:408
+#: ../IkiWiki/Plugin/passwordauth.pm:418
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:411
+#: ../IkiWiki/Plugin/passwordauth.pm:421
 msgid "password reset denied"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:424
+#: ../IkiWiki/Plugin/passwordauth.pm:434
 msgid "incorrect url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:427
+#: ../IkiWiki/Plugin/passwordauth.pm:437
 msgid "access denied"
 msgstr ""
 
@@ -648,7 +732,7 @@ msgstr ""
 msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/pinger.pm:80
+#: ../IkiWiki/Plugin/pinger.pm:81
 msgid "LWP not found, not pinging"
 msgstr ""
 
@@ -656,108 +740,108 @@ msgstr ""
 msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:179
+#: ../IkiWiki/Plugin/po.pm:178
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:191
+#: ../IkiWiki/Plugin/po.pm:190
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:196
+#: ../IkiWiki/Plugin/po.pm:195
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:473
+#: ../IkiWiki/Plugin/po.pm:471
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:496
+#: ../IkiWiki/Plugin/po.pm:494
 msgid ""
 "Can not remove a translation. If the master page is removed, however, its "
 "translations will be removed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:516
+#: ../IkiWiki/Plugin/po.pm:514
 msgid ""
 "Can not rename a translation. If the master page is renamed, however, its "
 "translations will be renamed as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:975
+#: ../IkiWiki/Plugin/po.pm:928
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:942
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:998
+#: ../IkiWiki/Plugin/po.pm:950
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1004
+#: ../IkiWiki/Plugin/po.pm:956
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1040
+#: ../IkiWiki/Plugin/po.pm:992
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1051
+#: ../IkiWiki/Plugin/po.pm:1003
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1134
+#: ../IkiWiki/Plugin/po.pm:1086
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1191 ../IkiWiki/Plugin/po.pm:1203
-#: ../IkiWiki/Plugin/po.pm:1242
+#: ../IkiWiki/Plugin/po.pm:1142 ../IkiWiki/Plugin/po.pm:1154
+#: ../IkiWiki/Plugin/po.pm:1193
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1201
+#: ../IkiWiki/Plugin/po.pm:1152
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1254
+#: ../IkiWiki/Plugin/po.pm:1205
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1297
+#: ../IkiWiki/Plugin/po.pm:1248
 #, perl-format
 msgid "%s has invalid syntax: must use CODE|NAME"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:72 ../IkiWiki/Plugin/poll.pm:87
+#: ../IkiWiki/Plugin/poll.pm:78 ../IkiWiki/Plugin/poll.pm:93
 msgid "vote"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:86
+#: ../IkiWiki/Plugin/poll.pm:92
 msgid "Write in"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:93
+#: ../IkiWiki/Plugin/poll.pm:99
 msgid "Total votes:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:42
+#: ../IkiWiki/Plugin/polygen.pm:43
 msgid "polygen not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:61
+#: ../IkiWiki/Plugin/polygen.pm:62
 msgid "command failed"
 msgstr ""
 
@@ -856,31 +940,31 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:39 ../IkiWiki/Plugin/rename.pm:37
+#: ../IkiWiki/Plugin/remove.pm:40 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:56
+#: ../IkiWiki/Plugin/remove.pm:57
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:59 ../IkiWiki/Plugin/rename.pm:46
+#: ../IkiWiki/Plugin/remove.pm:60 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:166
+#: ../IkiWiki/Plugin/remove.pm:167
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:203
+#: ../IkiWiki/Plugin/remove.pm:206
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:263
+#: ../IkiWiki/Plugin/remove.pm:267
 msgid "removed"
 msgstr ""
 
@@ -913,24 +997,24 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:164
+#: ../IkiWiki/Plugin/rename.pm:165
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:266
+#: ../IkiWiki/Plugin/rename.pm:267
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:269
+#: ../IkiWiki/Plugin/rename.pm:270
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:379
+#: ../IkiWiki/Plugin/rename.pm:380
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:605
+#: ../IkiWiki/Plugin/rename.pm:606
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -1012,10 +1096,6 @@ msgstr ""
 msgid "failed to run php"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:32
-msgid "cannot find file"
-msgstr ""
-
 #: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
@@ -1028,7 +1108,7 @@ msgstr ""
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:149
+#: ../IkiWiki/Plugin/table.pm:150
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
@@ -1042,6 +1122,10 @@ msgstr ""
 msgid "missing id parameter"
 msgstr ""
 
+#: ../IkiWiki/Plugin/templatebody.pm:42
+msgid "first parameter must be the content"
+msgstr ""
+
 #: ../IkiWiki/Plugin/teximg.pm:73
 msgid "missing tex code"
 msgstr ""
@@ -1050,7 +1134,7 @@ msgstr ""
 msgid "failed to generate image from code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/trail.pm:393
+#: ../IkiWiki/Plugin/trail.pm:392
 #, perl-format
 msgid "building %s, its previous or next page has changed"
 msgstr ""
@@ -1111,69 +1195,69 @@ msgstr ""
 msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:34
+#: ../IkiWiki/Receive.pm:36
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:158
+#: ../IkiWiki/Render.pm:161
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:281
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:332 ../IkiWiki/Render.pm:393
+#: ../IkiWiki/Render.pm:336 ../IkiWiki/Render.pm:397
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:349 ../IkiWiki/Render.pm:398
+#: ../IkiWiki/Render.pm:353 ../IkiWiki/Render.pm:402
 #, perl-format
-msgid "%s has multiple possible source pages"
+msgid "%s has multiple possible source files; one will be chosen at random"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:435
+#: ../IkiWiki/Render.pm:439
 #, perl-format
 msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:509
+#: ../IkiWiki/Render.pm:518
 #, perl-format
 msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:593
+#: ../IkiWiki/Render.pm:603
 #, perl-format
 msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:602
+#: ../IkiWiki/Render.pm:612
 #, perl-format
 msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:685 ../IkiWiki/Render.pm:767
+#: ../IkiWiki/Render.pm:695 ../IkiWiki/Render.pm:777
 #, perl-format
 msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:780
+#: ../IkiWiki/Render.pm:790
 #, perl-format
 msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:883
+#: ../IkiWiki/Render.pm:902
 #, perl-format
 msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:948
+#: ../IkiWiki/Render.pm:971
 #, perl-format
 msgid "ikiwiki: cannot build %s"
 msgstr ""
@@ -1230,98 +1314,98 @@ msgstr ""
 msgid "wrapper filename not specified"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:109
+#: ../IkiWiki/Wrapper.pm:122
 msgid "Please wait"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:268
+#: ../IkiWiki/Wrapper.pm:304
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:288
+#: ../IkiWiki/Wrapper.pm:324
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
 
-#: ../ikiwiki.in:10
+#: ../ikiwiki.in:11
 msgid "usage: ikiwiki [options] source dest"
 msgstr ""
 
-#: ../ikiwiki.in:11
-msgid "       ikiwiki --setup configfile"
+#: ../ikiwiki.in:12
+msgid "       ikiwiki --setup my.setup [options]"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:109
+#: ../ikiwiki.in:110
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:214
+#: ../ikiwiki.in:215
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:217
+#: ../ikiwiki.in:218
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:255
+#: ../IkiWiki.pm:270
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki.pm:595
+#: ../IkiWiki.pm:656
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:643
+#: ../IkiWiki.pm:731
 #, perl-format
 msgid "unsupported umask setting %s"
 msgstr ""
 
-#: ../IkiWiki.pm:683
+#: ../IkiWiki.pm:771
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:713
+#: ../IkiWiki.pm:801
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1515
+#: ../IkiWiki.pm:1652
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1709
+#: ../IkiWiki.pm:1851
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2019
+#: ../IkiWiki.pm:2164
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki.pm:2269
+#: ../IkiWiki.pm:2422
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2354
+#: ../IkiWiki.pm:2626
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2375
+#: ../IkiWiki.pm:2647
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2511
+#: ../IkiWiki.pm:2796
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
@@ -1339,7 +1423,7 @@ msgid "What revision control system to use?"
 msgstr ""
 
 #: ../auto.setup:21
-msgid "Which user (wiki account or openid) will be admin?"
+msgid "Which user (wiki account, openid, or email) will be admin?"
 msgstr ""
 
 #: ../auto.setup:24