X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a..5d0763daab6685df349f436be098baa433a7714c:/po/ikiwiki.pot?ds=inline

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index b8592bd48..77ae82319 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,134 +8,136 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-04 14:59-0400\n"
+"POT-Creation-Date: 2016-07-28 10:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../IkiWiki/CGI.pm:113
-msgid "You need to log in first."
-msgstr ""
-
-#: ../IkiWiki/CGI.pm:146
+#: ../IkiWiki/CGI.pm:222
 msgid ""
-"probable misconfiguration: sslcookie is set, but you are attepting to login "
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:149
+#: ../IkiWiki/CGI.pm:225
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:244 ../IkiWiki/CGI.pm:399
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:189
+#: ../IkiWiki/CGI.pm:265
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:190
+#: ../IkiWiki/CGI.pm:266
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:191
+#: ../IkiWiki/CGI.pm:267
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:231
+#: ../IkiWiki/CGI.pm:307
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:262
+#: ../IkiWiki/CGI.pm:362
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1211
+#: ../IkiWiki/CGI.pm:495 ../IkiWiki/CGI.pm:496 ../IkiWiki.pm:1653
 msgid "Error"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:84
+#: ../IkiWiki/Plugin/aggregate.pm:86
 msgid "Aggregation triggered via web."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:93
+#: ../IkiWiki/Plugin/aggregate.pm:95
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:227
 #, perl-format
 msgid "missing %s parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:262
 msgid "new feed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:276
 msgid "posts"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:278
 msgid "new"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:435
+#: ../IkiWiki/Plugin/aggregate.pm:465
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:442
+#: ../IkiWiki/Plugin/aggregate.pm:472
 #, perl-format
 msgid "expiring %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:500
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:473
+#: ../IkiWiki/Plugin/aggregate.pm:504
 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:478
+#: ../IkiWiki/Plugin/aggregate.pm:509
 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:497
+#: ../IkiWiki/Plugin/aggregate.pm:529
 msgid "feed not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:508
+#: ../IkiWiki/Plugin/aggregate.pm:540
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:516
+#: ../IkiWiki/Plugin/aggregate.pm:548
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:524
+#: ../IkiWiki/Plugin/aggregate.pm:558
 msgid "feed crashed XML::Feed!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/aggregate.pm:610
+#: ../IkiWiki/Plugin/aggregate.pm:654
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
 
+#: ../IkiWiki/Plugin/aggregate.pm:684 ../IkiWiki/Plugin/edittemplate.pm:137
+msgid "failed to process template:"
+msgstr ""
+
 #: ../IkiWiki/Plugin/amazon_s3.pm:31
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
 msgid "done"
 msgstr ""
 
@@ -144,426 +146,684 @@ msgstr ""
 msgid "Must specify %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:136
-msgid "Failed to create bucket in S3: "
+#: ../IkiWiki/Plugin/amazon_s3.pm:140
+msgid "Failed to create S3 bucket: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225
 msgid "Failed to save file to S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:248
 msgid "Failed to delete file from S3: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:52
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:68
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:234
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:307
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:105
-msgid "automatic index generation"
+#: ../IkiWiki/Plugin/attachment.pm:358
+msgid "this attachment is not yet saved"
+msgstr ""
+
+#: ../IkiWiki/Plugin/attachment.pm:376
+msgid "just uploaded"
+msgstr ""
+
+#: ../IkiWiki/Plugin/autoindex.pm:43
+#, perl-format
+msgid "creating index page %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/blogspam.pm:105
+#: ../IkiWiki/Plugin/blogspam.pm:139
 msgid ""
 "Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
 "\">blogspam</a>: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
-#: ../IkiWiki/Plugin/inline.pm:361 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
-msgstr ""
-
-#: ../IkiWiki/Plugin/brokenlinks.pm:49
+#: ../IkiWiki/Plugin/brokenlinks.pm:38
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:56
+#: ../IkiWiki/Plugin/brokenlinks.pm:46
 msgid "There are no broken links!"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:23
+#: ../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"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:131
+msgid "moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:158 ../IkiWiki/Plugin/format.pm:50
 #, perl-format
 msgid "unsupported page format %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:127
+#: ../IkiWiki/Plugin/comments.pm:163
 msgid "comment must have content"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:183
+#: ../IkiWiki/Plugin/comments.pm:227
 msgid "Anonymous"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:326 ../IkiWiki/Plugin/editpage.pm:97
+#: ../IkiWiki/Plugin/comments.pm:285
+msgid "Comment Moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:382 ../IkiWiki/Plugin/comments.pm:386
+msgid "email replies to me"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:420 ../IkiWiki/Plugin/editpage.pm:96
+#: ../IkiWiki/Plugin/editpage.pm:102
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:331
+#: ../IkiWiki/Plugin/comments.pm:423
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:349
+#: ../IkiWiki/Plugin/comments.pm:440
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:356
+#: ../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:450
+#: ../IkiWiki/Plugin/comments.pm:584
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:452
+#: ../IkiWiki/Plugin/comments.pm:586
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:465
+#: ../IkiWiki/Plugin/comments.pm:599
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:469
+#: ../IkiWiki/Plugin/comments.pm:603
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:511 ../IkiWiki/Plugin/websetup.pm:236
+#: ../IkiWiki/Plugin/comments.pm:677 ../IkiWiki/Plugin/userlist.pm:55
+#: ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:562
+#: ../IkiWiki/Plugin/comments.pm:736
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:601
+#: ../IkiWiki/Plugin/comments.pm:777
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:752
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:942
+#, perl-format
+msgid "%i comment"
+msgid_plural "%i comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#. translators: Here "Comment" is a verb;
+#. translators: the user clicks on it to
+#. translators: post a comment.
+#: ../IkiWiki/Plugin/comments.pm:952
+msgid "Comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:46
+#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:80
 msgid "no text was copied in this page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:83
 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:40
+#: ../IkiWiki/Plugin/editpage.pm:41
 #, perl-format
 msgid "removing old preview %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:113
+#: ../IkiWiki/Plugin/editpage.pm:118
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:289
+#: ../IkiWiki/Plugin/editpage.pm:166
+msgid "email comments to me"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:320
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:307 ../IkiWiki/Plugin/editpage.pm:326
-#: ../IkiWiki/Plugin/editpage.pm:336 ../IkiWiki/Plugin/editpage.pm:380
-#: ../IkiWiki/Plugin/editpage.pm:419
+#: ../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 ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:54
 msgid "template not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:57
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:72
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:133
-msgid "failed to process"
+#: ../IkiWiki/Plugin/emailauth.pm:61
+msgid "Invalid email address."
+msgstr ""
+
+#: ../IkiWiki/Plugin/emailauth.pm:98 ../IkiWiki/Plugin/passwordauth.pm:377
+msgid "Failed to send mail"
+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:20
+#: ../IkiWiki/Plugin/format.pm:30
 msgid "must specify format and text"
 msgstr ""
 
-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28
 msgid "fortune failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59
+msgid "missing page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61
+#, perl-format
+msgid "The page %s does not exist."
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:75
+msgid "not a page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:77
+#, perl-format
+msgid "%s is an attachment, not a page."
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:866 ../IkiWiki/Plugin/git.pm:929 ../IkiWiki.pm:1873
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:666
+#: ../IkiWiki/Plugin/git.pm:888
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:670
+#: ../IkiWiki/Plugin/git.pm:892
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:27
+#: ../IkiWiki/Plugin/git.pm:962
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:981
 #, perl-format
-msgid "Must specify %s when using the google search plugin"
+msgid "Failed to revert commit %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:48
+#, perl-format
+msgid "Must specify %s when using the %s plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:49
-msgid "missing page"
+#: ../IkiWiki/Plugin/graphviz.pm:87
+msgid "failed to run graphviz"
+msgstr ""
+
+#: ../IkiWiki/Plugin/graphviz.pm:144
+msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/goto.pm:51
+#: ../IkiWiki/Plugin/highlight.pm:91
 #, perl-format
-msgid "The page %s does not exist."
+msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:67
-msgid "failed to run graphviz"
+#: ../IkiWiki/Plugin/highlight.pm:102
+#, perl-format
+msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/graphviz.pm:94
-msgid "prog not a valid graphviz program"
+#: ../IkiWiki/Plugin/highlight.pm:198
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
+#: ../IkiWiki/Plugin/htmltidy.pm:65
+msgid "htmltidy failed to parse this html"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:96
+msgid "Unable to detect image type from extension"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:104 ../IkiWiki/Plugin/img.pm:136
+#: ../IkiWiki/Plugin/img.pm:175 ../IkiWiki/Plugin/img.pm:217
+#, perl-format
+msgid "failed to read %s: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:131
+#, perl-format
+msgid "%s image processing disabled in img_allowed_formats configuration"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:138
+#, perl-format
+msgid "\"%s\" does not seem to be a valid %s file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:62
+#: ../IkiWiki/Plugin/img.pm:172
 msgid "Image::Magick is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/img.pm:178
 #, perl-format
-msgid "bad size \"%s\""
+msgid "failed to get dimensions of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:185
 #, perl-format
-msgid "failed to read %s: %s"
+msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:221
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:246
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:92
+#: ../IkiWiki/Plugin/inline.pm:93
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:138
+#: ../IkiWiki/Plugin/inline.pm:139
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:200
-msgid "Sort::Naturally needed for title_natural sort"
+#: ../IkiWiki/Plugin/inline.pm:228
+#, perl-format
+msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:211
+#: ../IkiWiki/Plugin/inline.pm:334
 #, perl-format
-msgid "unknown sort type %s"
+msgid "%s (RSS feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:314
-msgid "Add a new post titled:"
+#: ../IkiWiki/Plugin/inline.pm:338
+#, perl-format
+msgid "%s (Atom feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:334
-#, perl-format
-msgid "nonexistant template %s"
+#: ../IkiWiki/Plugin/inline.pm:371
+msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:369 ../IkiWiki/Render.pm:83
-msgid "Discussion"
+#: ../IkiWiki/Plugin/inline.pm:412 ../IkiWiki/Plugin/template.pm:46
+#, perl-format
+msgid "failed to process template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:600
+#: ../IkiWiki/Plugin/inline.pm:752
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../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/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:98
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:49
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/loginselector.pm:95
+msgid "Other"
+msgstr ""
+
+#: ../IkiWiki/Plugin/loginselector.pm:106
+msgid "Password"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mdwn.pm:53
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:98
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:158
+#: ../IkiWiki/Plugin/meta.pm:127
+msgid "enclosure not found"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:187
 msgid "stylesheet not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:192
+#: ../IkiWiki/Plugin/meta.pm:199
+msgid "script not found"
+msgstr ""
+
+#: ../IkiWiki/Plugin/meta.pm:247
 msgid "redir page not found"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:205
+#: ../IkiWiki/Plugin/meta.pm:261
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/meta.pm:451
+msgid "sort=meta requires a parameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:57
 msgid "Mirrors"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:57
 msgid "Mirror"
 msgstr ""
 
+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
+msgid "comment needs moderation"
+msgstr ""
+
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
 
-#: ../IkiWiki/Plugin/norcs.pm:65
-msgid "getctime not implemented"
+#: ../IkiWiki/Plugin/notifyemail.pm:72
+msgid "Cannot subscribe your email address without logging in."
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:61
-msgid "Log in with"
+#: ../IkiWiki/Plugin/notifyemail.pm:136
+msgid "change notification:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/openid.pm:64
-msgid "Get an OpenID"
+#: ../IkiWiki/Plugin/notifyemail.pm:138
+msgid "comment notification:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/orphans.pm:51
-msgid "All pages are linked to by other pages."
+#: ../IkiWiki/Plugin/orphans.pm:56
+msgid "All pages have other pages linking to them."
 msgstr ""
 
 #: ../IkiWiki/Plugin/pagetemplate.pm:30
 msgid "bad or missing template"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:247
-msgid "Account creation successful. Now you can Login."
+#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:343
+msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:250
-msgid "Error creating account."
+#: ../IkiWiki/Plugin/passwordauth.pm:303
+msgid "Your user page: "
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:257
-msgid "No email address, so cannot email password reset instructions."
+#: ../IkiWiki/Plugin/passwordauth.pm:310
+msgid "Create your user page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:291
-msgid "Failed to send mail"
+#: ../IkiWiki/Plugin/passwordauth.pm:340
+msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:293
+#: ../IkiWiki/Plugin/passwordauth.pm:350
+msgid "No email address, so cannot email password reset instructions."
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:379
 msgid "You have been mailed password reset instructions."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:328
+#: ../IkiWiki/Plugin/passwordauth.pm:414
 msgid "incorrect password reset url"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:331
+#: ../IkiWiki/Plugin/passwordauth.pm:417
 msgid "password reset denied"
 msgstr ""
 
+#: ../IkiWiki/Plugin/passwordauth.pm:430
+msgid "incorrect url"
+msgstr ""
+
+#: ../IkiWiki/Plugin/passwordauth.pm:433
+msgid "access denied"
+msgstr ""
+
 #: ../IkiWiki/Plugin/pingee.pm:30
 msgid "Ping received."
 msgstr ""
 
-#: ../IkiWiki/Plugin/pinger.pm:53
+#: ../IkiWiki/Plugin/pinger.pm:54
 msgid "requires 'from' and 'to' parameters"
 msgstr ""
 
-#: ../IkiWiki/Plugin/pinger.pm:58
+#: ../IkiWiki/Plugin/pinger.pm:59
 #, perl-format
 msgid "Will ping %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/pinger.pm:61
+#: ../IkiWiki/Plugin/pinger.pm:62
 #, perl-format
 msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/pinger.pm:77
+#: ../IkiWiki/Plugin/pinger.pm:80
 msgid "LWP not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:69
+#: ../IkiWiki/Plugin/po.pm:15
+msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:179
+#, perl-format
+msgid "%s is not a valid language code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:191
+#, 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
+msgid ""
+"po_link_to=negotiated requires usedirs to be enabled, falling back to "
+"po_link_to=default"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:473
+msgid "updated PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:496
+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
+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
+#, perl-format
+msgid "POT file (%s) does not exist"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:989
+#, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:997
+#, perl-format
+msgid "failed to update %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1003
+#, perl-format
+msgid "failed to copy the POT file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1039
+msgid "N/A"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1050
+#, perl-format
+msgid "failed to translate %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1133
+msgid "removed obsolete PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1190 ../IkiWiki/Plugin/po.pm:1202
+#: ../IkiWiki/Plugin/po.pm:1241
+#, perl-format
+msgid "failed to write %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1200
+msgid "failed to translate"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1253
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1296
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
+#: ../IkiWiki/Plugin/poll.pm:72 ../IkiWiki/Plugin/poll.pm:87
 msgid "vote"
 msgstr ""
 
-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:86
+msgid "Write in"
+msgstr ""
+
+#: ../IkiWiki/Plugin/poll.pm:93
 msgid "Total votes:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:43
 msgid "polygen not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:62
 msgid "command failed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:47
 msgid "missing formula"
 msgstr ""
 
-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:54
 msgid "unknown formula"
 msgstr ""
 
@@ -631,53 +891,63 @@ msgstr ""
 msgid "at noon on %A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:34
+#: ../IkiWiki/Plugin/progress.pm:35
 #, perl-format
 msgid "illegal percent value %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/progress.pm:59
+#: ../IkiWiki/Plugin/progress.pm:56
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 
-#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
+#: ../IkiWiki/Plugin/recentchanges.pm:106
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:125
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:49
 msgid "(Diff truncated)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:40 ../IkiWiki/Plugin/rename.pm:37
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:57
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:60 ../IkiWiki/Plugin/rename.pm:46
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:115
+#: ../IkiWiki/Plugin/remove.pm:167
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:152
+#: ../IkiWiki/Plugin/remove.pm:204
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:192
+#: ../IkiWiki/Plugin/remove.pm:264
 msgid "removed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:42
+#: ../IkiWiki/Plugin/rename.pm:43
 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be renamed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:62
+#: ../IkiWiki/Plugin/rename.pm:63
 msgid "no change to the file name was specified"
 msgstr ""
 
@@ -696,341 +966,428 @@ msgstr ""
 msgid "%s already exists on disk"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:101
+#: ../IkiWiki/Plugin/rename.pm:123
 #, perl-format
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:165
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:267
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:270
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:380
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:493
+#: ../IkiWiki/Plugin/rename.pm:606
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/rsync.pm:37
 #, perl-format
-msgid "Must specify %s when using the search plugin"
+msgid "failed to execute rsync_command: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/rsync.pm:40
 #, perl-format
-msgid "need Digest::SHA1 to index %s"
+msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:216
+#, perl-format
+msgid "need Digest::SHA to index %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/search.pm:270
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:31
+#: ../IkiWiki/Plugin/shortcut.pm:32
 #, perl-format
 msgid "shortcut plugin will not work without %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:44
+#: ../IkiWiki/Plugin/shortcut.pm:45
 msgid "missing name or url parameter"
 msgstr ""
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:54
+#: ../IkiWiki/Plugin/shortcut.pm:55
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
 
-#: ../IkiWiki/Plugin/smiley.pm:43
+#: ../IkiWiki/Plugin/smiley.pm:30
+#, perl-format
+msgid "smiley plugin will not work without %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/smiley.pm:50
 msgid "failed to parse any smileys"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73
 msgid "parse error"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#: ../IkiWiki/Plugin/sparkline.pm:79
+msgid "invalid featurepoint diameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#: ../IkiWiki/Plugin/sparkline.pm:89
+msgid "invalid featurepoint location"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100
 msgid "missing values"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#: ../IkiWiki/Plugin/sparkline.pm:105
+msgid "invalid height value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112
 msgid "missing width parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#: ../IkiWiki/Plugin/sparkline.pm:116
+msgid "invalid width value"
 msgstr ""
 
-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154
 msgid "failed to run php"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32
 msgid "cannot find file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:87
+#: ../IkiWiki/Plugin/table.pm:88
 msgid "unknown data format"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:95
+#: ../IkiWiki/Plugin/table.pm:96
 msgid "empty data"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:114
+#: ../IkiWiki/Plugin/table.pm:115
 msgid "Direct data download"
 msgstr ""
 
-#: ../IkiWiki/Plugin/table.pm:148
+#: ../IkiWiki/Plugin/table.pm:149
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:29
+#: ../IkiWiki/Plugin/tag.pm:114
+#, perl-format
+msgid "creating tag page %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/template.pm:33
 msgid "missing id parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:36
+#: ../IkiWiki/Plugin/templatebody.pm:42
+msgid "first parameter must be the content"
+msgstr ""
+
+#: ../IkiWiki/Plugin/teximg.pm:73
+msgid "missing tex code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/teximg.pm:125
+msgid "failed to generate image from code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/trail.pm:392
 #, perl-format
-msgid "template %s not found"
+msgid "building %s, its previous or next page has changed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/template.pm:55
-msgid "failed to process:"
+#: ../IkiWiki/Plugin/transient.pm:45
+#, perl-format
+msgid "removing transient version of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:70
-msgid "missing tex code"
+#: ../IkiWiki/Plugin/userlist.pm:59
+msgid "login"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
+#: ../IkiWiki/Plugin/userlist.pm:59
+msgid "email"
 msgstr ""
 
-#: ../IkiWiki/Plugin/teximg.pm:128
-msgid "failed to generate image from code"
+#: ../IkiWiki/Plugin/userlist.pm:73
+msgid "Users"
+msgstr ""
+
+#: ../IkiWiki/Plugin/websetup.pm:105
+#, perl-format
+msgid "%s plugin:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:121
+#, perl-format
+msgid "%s plugins"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:135
 #, perl-format
 msgid "enable %s?"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:276
 msgid "setup file for this wiki is not known"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:292
 msgid "main"
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:257
-msgid "plugins"
-msgstr ""
-
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:436
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:440
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
-#: ../IkiWiki/Plugin/websetup.pm:433
+#: ../IkiWiki/Plugin/websetup.pm:477
 #, perl-format
-msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
+msgid "Error: %s exited nonzero (%s). Discarding setup changes."
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 
-#: ../IkiWiki/Receive.pm:85
+#: ../IkiWiki/Render.pm:161
 #, perl-format
-msgid "bad file name %s"
+msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:253
+#: ../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:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:336 ../IkiWiki/Render.pm:397
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:284
+#: ../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:360
+#: ../IkiWiki/Render.pm:439
 #, perl-format
-msgid "removing old page %s"
+msgid "querying %s for file creation and modification times.."
 msgstr ""
 
-#: ../IkiWiki/Render.pm:400
+#: ../IkiWiki/Render.pm:518
 #, perl-format
-msgid "scanning %s"
+msgid "removing obsolete %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:405
+#: ../IkiWiki/Render.pm:603
 #, perl-format
-msgid "rendering %s"
+msgid "building %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Render.pm:612
 #, perl-format
-msgid "rendering %s, which links to %s"
+msgid "removing %s, no longer built by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:695 ../IkiWiki/Render.pm:777
 #, perl-format
-msgid "rendering %s, which depends on %s"
+msgid "building %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:790
 #, perl-format
-msgid "rendering %s, to update its backlinks"
+msgid "building %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:498
+#: ../IkiWiki/Render.pm:902
 #, perl-format
-msgid "removing %s, no longer rendered by %s"
+msgid "building %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:522
+#: ../IkiWiki/Render.pm:971
 #, perl-format
-msgid "ikiwiki: cannot render %s"
+msgid "ikiwiki: cannot build %s"
 msgstr ""
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
-#: ../IkiWiki/Setup.pm:19
+#: ../IkiWiki/Setup.pm:23
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr ""
 
+#: ../IkiWiki/Setup.pm:34
+#, perl-format
+msgid "cannot load %s in safe mode"
+msgstr ""
+
+#: ../IkiWiki/Setup.pm:47
+#, perl-format
+msgid "failed to parse %s"
+msgstr ""
+
 #: ../IkiWiki/Setup/Automator.pm:34
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:68
+#: ../IkiWiki/Setup/Automator.pm:89
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
-#: ../IkiWiki/Setup/Automator.pm:94
+#: ../IkiWiki/Setup/Automator.pm:115
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:16
+#: ../IkiWiki/Setup/Automator.pm:134
+#, perl-format
+msgid "** Disabling plugin %s, since it is failing with this message:"
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:12
+msgid "generating wrappers.."
+msgstr ""
+
+#: ../IkiWiki/Wrapper.pm:37
 #, perl-format
 msgid "%s doesn't seem to be executable"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:20
+#: ../IkiWiki/Wrapper.pm:41
 msgid "cannot create a wrapper that uses a setup file"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:24
+#: ../IkiWiki/Wrapper.pm:45
 msgid "wrapper filename not specified"
 msgstr ""
 
+#: ../IkiWiki/Wrapper.pm:120
+msgid "Please wait"
+msgstr ""
+
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:152
+#: ../IkiWiki/Wrapper.pm:301
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:172
+#: ../IkiWiki/Wrapper.pm:321
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
 
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:11
 msgid "usage: ikiwiki [options] source dest"
 msgstr ""
 
-#: ../ikiwiki.in:14
-msgid "       ikiwiki --setup configfile"
+#: ../ikiwiki.in:12
+msgid "       ikiwiki --setup my.setup [options]"
 msgstr ""
 
-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:103
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:140
-msgid "generating wrappers.."
+#: ../ikiwiki.in:110
+msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:199
+#: ../ikiwiki.in:215
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:202
+#: ../ikiwiki.in:218
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:270
+msgid "Discussion"
+msgstr ""
+
+#: ../IkiWiki.pm:656
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:526
+#: ../IkiWiki.pm:731
+#, perl-format
+msgid "unsupported umask setting %s"
+msgstr ""
+
+#: ../IkiWiki.pm:771
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:801
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1194
+#: ../IkiWiki.pm:1633
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1732
+#: ../IkiWiki.pm:1829
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2142
+#, perl-format
+msgid "template %s not found"
+msgstr ""
+
+#: ../IkiWiki.pm:2400
 msgid "yes"
 msgstr ""
 
+#: ../IkiWiki.pm:2485
+#, perl-format
+msgid "invalid sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2506
+#, perl-format
+msgid "unknown sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2655
+#, perl-format
+msgid "cannot match pages: %s"
+msgstr ""
+
 #: ../auto.setup:16
 msgid "What will the wiki be named?"
 msgstr ""
@@ -1039,14 +1396,14 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
-#: ../auto.setup:18
+#: ../auto.setup:19
 msgid "What revision control system to use?"
 msgstr ""
 
-#: ../auto.setup:20
-msgid "What wiki user (or openid) will be admin?"
+#: ../auto.setup:21
+msgid "Which user (wiki account, openid, or email) will be admin?"
 msgstr ""
 
-#: ../auto.setup:23
+#: ../auto.setup:24
 msgid "What is the domain name of the web server?"
 msgstr ""