test from google openid

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

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 560a5b2a1c90fd9a04e0450c5d8dbbc0e3f9cb85..e50fa0f68ff4ba13f385074f6876f4b46d2884b2 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,47 +8,51 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-01-05 18:53-0500\n"
+"POT-Creation-Date: 2010-06-23 17:10-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "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"
 "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."
+#: ../IkiWiki/CGI.pm:162
+msgid ""
+"probable misconfiguration: sslcookie is set, but you are attempting to login "
+"via http, not https"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:145
+#: ../IkiWiki/CGI.pm:165

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280
+#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335

 msgid "Your login session has expired."
 msgstr ""
 
 msgid "Your login session has expired."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:184
+#: ../IkiWiki/CGI.pm:205

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:185
+#: ../IkiWiki/CGI.pm:206

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:186
+#: ../IkiWiki/CGI.pm:207

 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:226
+#: ../IkiWiki/CGI.pm:247

 msgid "Preferences saved."
 msgstr ""
 
 msgid "Preferences saved."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:241
+#: ../IkiWiki/CGI.pm:299

 msgid "You are banned."
 msgstr ""
 
 msgid "You are banned."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204
+#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1317

 msgid "Error"
 msgstr ""
 
 msgid "Error"
 msgstr ""
 


@@ -77,50 +81,50 @@ msgstr ""
 msgid "new"
 msgstr ""
 
 msgid "new"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:435
+#: ../IkiWiki/Plugin/aggregate.pm:441

 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:442
+#: ../IkiWiki/Plugin/aggregate.pm:448

 #, perl-format
 msgid "expiring %s"
 msgstr ""
 
 #, perl-format
 msgid "expiring %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:469
+#: ../IkiWiki/Plugin/aggregate.pm:475

 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:473
+#: ../IkiWiki/Plugin/aggregate.pm:479

 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 
 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:478
+#: ../IkiWiki/Plugin/aggregate.pm:484

 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 
 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:497
+#: ../IkiWiki/Plugin/aggregate.pm:503

 msgid "feed not found"
 msgstr ""
 
 msgid "feed not found"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:508
+#: ../IkiWiki/Plugin/aggregate.pm:514

 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:516
+#: ../IkiWiki/Plugin/aggregate.pm:522

 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:524
+#: ../IkiWiki/Plugin/aggregate.pm:530

 msgid "feed crashed XML::Feed!"
 msgstr ""
 
 msgid "feed crashed XML::Feed!"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:605
+#: ../IkiWiki/Plugin/aggregate.pm:616

 #, perl-format
 msgid "creating new page %s"
 msgstr ""
 #, perl-format
 msgid "creating new page %s"
 msgstr ""


@@ -129,7 +133,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
 msgid "deleting bucket.."
 msgstr ""
 

-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:208
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231

 msgid "done"
 msgstr ""
 
 msgid "done"
 msgstr ""
 


@@ -138,350 +142,423 @@ msgstr ""
 msgid "Must specify %s"
 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 ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/amazon_s3.pm:221
+#: ../IkiWiki/Plugin/amazon_s3.pm:225

 msgid "Failed to save file to S3: "
 msgstr ""
 
 msgid "Failed to save file to S3: "
 msgstr ""
 

-#: ../IkiWiki/Plugin/amazon_s3.pm:243
+#: ../IkiWiki/Plugin/amazon_s3.pm:247

 msgid "Failed to delete file from S3: "
 msgstr ""
 
 msgid "Failed to delete file from S3: "
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:50

 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:65
+#: ../IkiWiki/Plugin/attachment.pm:66

 msgid "prohibited by allowed_attachments"
 msgstr ""
 
 msgid "prohibited by allowed_attachments"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:140
+#: ../IkiWiki/Plugin/attachment.pm:144

 msgid "bad attachment filename"
 msgstr ""
 
 msgid "bad attachment filename"
 msgstr ""
 

-#: ../IkiWiki/Plugin/attachment.pm:182
+#: ../IkiWiki/Plugin/attachment.pm:188

 msgid "attachment upload"
 msgstr ""
 
 msgid "attachment upload"
 msgstr ""
 

-#: ../IkiWiki/Plugin/autoindex.pm:105
+#: ../IkiWiki/Plugin/autoindex.pm:120

 msgid "automatic index generation"
 msgstr ""
 
 msgid "automatic index generation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:260
-#: ../IkiWiki/Plugin/inline.pm:354 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:149
-msgid "discussion"
+#: ../IkiWiki/Plugin/blogspam.pm:110
+msgid ""
+"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
+"\">blogspam</a>: "

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/brokenlinks.pm:49
+#: ../IkiWiki/Plugin/brokenlinks.pm:38

 #, perl-format
 msgid "%s from %s"
 msgstr ""
 
 #, perl-format
 msgid "%s from %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/brokenlinks.pm:56
+#: ../IkiWiki/Plugin/brokenlinks.pm:46

 msgid "There are no broken links!"
 msgstr ""
 
 msgid "There are no broken links!"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23
+#: ../IkiWiki/Plugin/comments.pm:112

 #, perl-format
 #, perl-format

-msgid "unsupported page format %s"
+msgid "this comment needs %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:125
-msgid "comment must have content"
+#: ../IkiWiki/Plugin/comments.pm:115
+msgid "moderation"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:181
-msgid "Anonymous"
+#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48
+#, perl-format
+msgid "unsupported page format %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110
-msgid "missing page"
+#: ../IkiWiki/Plugin/comments.pm:141
+msgid "comment must have content"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112
-#, perl-format
-msgid "The page %s does not exist."
+#: ../IkiWiki/Plugin/comments.pm:196
+msgid "Anonymous"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124
+#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98

 msgid "bad page name"
 msgstr ""
 
 msgid "bad page name"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:350
+#: ../IkiWiki/Plugin/comments.pm:362

 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:368
+#: ../IkiWiki/Plugin/comments.pm:380

 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:375
+#: ../IkiWiki/Plugin/comments.pm:387

 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:483
+#: ../IkiWiki/Plugin/comments.pm:491
+msgid "comment stored for moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:493
+msgid "Your comment will be posted after moderator review"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:506

 msgid "Added a comment"
 msgstr ""
 
 msgid "Added a comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:487
+#: ../IkiWiki/Plugin/comments.pm:510

 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:601
-msgid "Comments"
+#: ../IkiWiki/Plugin/comments.pm:554 ../IkiWiki/Plugin/websetup.pm:268
+msgid "you are not logged in as an admin"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:605
+msgid "Comment moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:645
+msgid "comment moderation"
+msgstr ""
+
+#: ../IkiWiki/Plugin/comments.pm:802
+#, 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:812
+msgid "Comment"

 msgstr ""
 
 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:28 ../IkiWiki/Plugin/cutpaste.pm:31
+#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62

 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
 msgstr ""
 

-#: ../IkiWiki/Plugin/cutpaste.pm:66
+#: ../IkiWiki/Plugin/cutpaste.pm:67

 msgid "no text was copied in this page"
 msgstr ""
 
 msgid "no text was copied in this page"
 msgstr ""
 

-#: ../IkiWiki/Plugin/cutpaste.pm:69
+#: ../IkiWiki/Plugin/cutpaste.pm:70

 #, perl-format
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
 #, 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 ""
 
 #, perl-format
 msgid "removing old preview %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/editpage.pm:140
+#: ../IkiWiki/Plugin/editpage.pm:114

 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 

-#: ../IkiWiki/Plugin/editpage.pm:316
+#: ../IkiWiki/Plugin/editpage.pm:294

 #, perl-format
 msgid "creating %s"
 msgstr ""
 
 #, perl-format
 msgid "creating %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:353
-#: ../IkiWiki/Plugin/editpage.pm:363 ../IkiWiki/Plugin/editpage.pm:398
-#: ../IkiWiki/Plugin/editpage.pm:443
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
+#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
+#: ../IkiWiki/Plugin/editpage.pm:430

 #, perl-format
 msgid "editing %s"
 msgstr ""
 
 #, perl-format
 msgid "editing %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/edittemplate.pm:51
+#: ../IkiWiki/Plugin/edittemplate.pm:52

 msgid "template not specified"
 msgstr ""
 
 msgid "template not specified"
 msgstr ""
 

-#: ../IkiWiki/Plugin/edittemplate.pm:54
+#: ../IkiWiki/Plugin/edittemplate.pm:55

 msgid "match not specified"
 msgstr ""
 
 msgid "match not specified"
 msgstr ""
 

-#: ../IkiWiki/Plugin/edittemplate.pm:62
+#: ../IkiWiki/Plugin/edittemplate.pm:70

 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/edittemplate.pm:133
-msgid "failed to process"
+#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
+#: ../IkiWiki/Plugin/template.pm:44
+msgid "failed to process template:"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/format.pm:20
+#: ../IkiWiki/Plugin/format.pm:30

 msgid "must specify format and text"
 msgstr ""
 
 msgid "must specify format and text"
 msgstr ""
 

-#: ../IkiWiki/Plugin/fortune.pm:27
+#: ../IkiWiki/Plugin/fortune.pm:28

 msgid "fortune failed"
 msgstr ""
 
 msgid "fortune failed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
+#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58
+msgid "missing page"
+msgstr ""
+
+#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60
+#, 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:724 ../IkiWiki/Plugin/git.pm:742

 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:658
+#: ../IkiWiki/Plugin/git.pm:764

 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/git.pm:662
+#: ../IkiWiki/Plugin/git.pm:768

 msgid "you are not allowed to change file modes"
 msgstr ""
 
 msgid "you are not allowed to change file modes"
 msgstr ""
 

-#: ../IkiWiki/Plugin/google.pm:27
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/search.pm:37

 #, perl-format
 #, perl-format

-msgid "Must specify %s when using the google search plugin"
-msgstr ""
-
-#: ../IkiWiki/Plugin/google.pm:31
-msgid "Failed to parse url, cannot determine domain name"
+msgid "Must specify %s when using the %s plugin"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/graphviz.pm:67
+#: ../IkiWiki/Plugin/graphviz.pm:68

 msgid "failed to run graphviz"
 msgstr ""
 
 msgid "failed to run graphviz"
 msgstr ""
 

-#: ../IkiWiki/Plugin/graphviz.pm:94
+#: ../IkiWiki/Plugin/graphviz.pm:91

 msgid "prog not a valid graphviz program"
 msgstr ""
 
 msgid "prog not a valid graphviz program"
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:62
-msgid "Image::Magick is not installed"
+#: ../IkiWiki/Plugin/highlight.pm:48
+#, perl-format
+msgid "tohighlight contains unknown file type '%s'"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:69
+#: ../IkiWiki/Plugin/highlight.pm:59

 #, perl-format
 #, perl-format

-msgid "bad size \"%s\""
+msgid "Source code: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/highlight.pm:124
+msgid ""
+"warning: highlight perl module not available; falling back to pass through"
+msgstr ""
+
+#: ../IkiWiki/Plugin/htmltidy.pm:50
+msgid "htmltidy failed to parse this html"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
-#: ../IkiWiki/Plugin/img.pm:101
+#: ../IkiWiki/Plugin/img.pm:69
+msgid "Image::Magick is not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117

 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to read %s: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:87
+#: ../IkiWiki/Plugin/img.pm:79
+#, perl-format
+msgid "wrong size format \"%s\" (should be WxH)"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:122

 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/img.pm:118
+#: ../IkiWiki/Plugin/img.pm:146

 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 msgid "page editing not allowed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:155
+#: ../IkiWiki/Plugin/inline.pm:156

 msgid "missing pages parameter"
 msgstr ""
 
 msgid "missing pages parameter"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:204
+#: ../IkiWiki/Plugin/inline.pm:192

 #, perl-format
 #, perl-format

-msgid "unknown sort type %s"
+msgid "the %s and %s parameters cannot be used together"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:307
+#: ../IkiWiki/Plugin/inline.pm:313

 msgid "Add a new post titled:"
 msgstr ""
 
 msgid "Add a new post titled:"
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/inline.pm:342

 #, perl-format
 #, perl-format

-msgid "nonexistant template %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/inline.pm:362 ../IkiWiki/Render.pm:83
-msgid "Discussion"
+msgid "template %s not found"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/inline.pm:587
+#: ../IkiWiki/Plugin/inline.pm:633

 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 

-#: ../IkiWiki/Plugin/linkmap.pm:106
+#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88
+#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95

 msgid "failed to run dot"
 msgstr ""
 
 msgid "failed to run dot"
 msgstr ""
 

-#: ../IkiWiki/Plugin/lockedit.pm:47
+#: ../IkiWiki/Plugin/linkmap.pm:85
+msgid "linkmap"
+msgstr ""
+
+#: ../IkiWiki/Plugin/lockedit.pm:49

 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
 

-#: ../IkiWiki/Plugin/mdwn.pm:44
+#: ../IkiWiki/Plugin/mdwn.pm:45

 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/mdwn.pm:67
+#: ../IkiWiki/Plugin/mdwn.pm:70

 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/meta.pm:151
+#: ../IkiWiki/Plugin/meta.pm:174

 msgid "stylesheet not found"
 msgstr ""
 
 msgid "stylesheet not found"
 msgstr ""
 

-#: ../IkiWiki/Plugin/meta.pm:185
+#: ../IkiWiki/Plugin/meta.pm:212

 msgid "redir page not found"
 msgstr ""
 
 msgid "redir page not found"
 msgstr ""
 

-#: ../IkiWiki/Plugin/meta.pm:198
+#: ../IkiWiki/Plugin/meta.pm:226

 msgid "redir cycle is not allowed"
 msgstr ""
 
 msgid "redir cycle is not allowed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/meta.pm:387
+msgid "sort=meta requires a parameter"
+msgstr ""
+
+#: ../IkiWiki/Plugin/mirrorlist.pm:44

 msgid "Mirrors"
 msgstr ""
 
 msgid "Mirrors"
 msgstr ""
 

-#: ../IkiWiki/Plugin/mirrorlist.pm:42
+#: ../IkiWiki/Plugin/mirrorlist.pm:44

 msgid "Mirror"
 msgstr ""
 
 msgid "Mirror"
 msgstr ""
 

+#: ../IkiWiki/Plugin/moderatedcomments.pm:57
+msgid "comment needs moderation"
+msgstr ""
+

 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
 
 #: ../IkiWiki/Plugin/more.pm:8
 msgid "more"
 msgstr ""
 

-#: ../IkiWiki/Plugin/norcs.pm:65
-msgid "getctime not implemented"
+#: ../IkiWiki/Plugin/openid.pm:70
+#, perl-format
+msgid "failed to load openid module: "

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/openid.pm:61
-msgid "Log in with"
+#: ../IkiWiki/Plugin/orphans.pm:56
+msgid "All pages have other pages linking to them."

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/openid.pm:64
-msgid "Get an OpenID"
+#: ../IkiWiki/Plugin/pagetemplate.pm:30
+msgid "bad or missing template"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/orphans.pm:51
-msgid "All pages are linked to by other pages."
+#: ../IkiWiki/Plugin/passwordauth.pm:231
+msgid "Your user page: "

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/pagetemplate.pm:30
-msgid "bad or missing template"
+#: ../IkiWiki/Plugin/passwordauth.pm:238
+msgid "Create your user page"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:247
+#: ../IkiWiki/Plugin/passwordauth.pm:268

 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:250
+#: ../IkiWiki/Plugin/passwordauth.pm:271

 msgid "Error creating account."
 msgstr ""
 
 msgid "Error creating account."
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:257
+#: ../IkiWiki/Plugin/passwordauth.pm:278

 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:291
+#: ../IkiWiki/Plugin/passwordauth.pm:312

 msgid "Failed to send mail"
 msgstr ""
 
 msgid "Failed to send mail"
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:293
+#: ../IkiWiki/Plugin/passwordauth.pm:314

 msgid "You have been mailed password reset instructions."
 msgstr ""
 
 msgid "You have been mailed password reset instructions."
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:328
+#: ../IkiWiki/Plugin/passwordauth.pm:349

 msgid "incorrect password reset url"
 msgstr ""
 
 msgid "incorrect password reset url"
 msgstr ""
 

-#: ../IkiWiki/Plugin/passwordauth.pm:331
+#: ../IkiWiki/Plugin/passwordauth.pm:352

 msgid "password reset denied"
 msgstr ""
 
 msgid "password reset denied"
 msgstr ""
 


@@ -507,27 +584,121 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr ""
 
 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:142
+#, perl-format
+msgid "%s is not a valid language code"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:154
+#, 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:159
+msgid ""
+"po_link_to=negotiated requires usedirs to be enabled, falling back to "
+"po_link_to=default"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:390
+#, perl-format
+msgid "rebuilding all pages to fix meta titles"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:784
+#, perl-format
+msgid "building %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:432
+msgid "updated PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:455
+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:475
+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:875
+#, perl-format
+msgid "POT file (%s) does not exist"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:889
+#, perl-format
+msgid "failed to copy underlay PO file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:898
+#, perl-format
+msgid "failed to update %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:904
+#, perl-format
+msgid "failed to copy the POT file to %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:940
+msgid "N/A"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:953
+#, perl-format
+msgid "failed to translate %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1037
+msgid "removed obsolete PO files"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108
+#: ../IkiWiki/Plugin/po.pm:1147
+#, perl-format
+msgid "failed to write %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1106
+msgid "failed to translate"
+msgstr ""
+
+#: ../IkiWiki/Plugin/po.pm:1159
+msgid "invalid gettext data, go back to previous page to continue edit"
+msgstr ""
+
+#: ../IkiWiki/Plugin/poll.pm:70

 msgid "vote"
 msgstr ""
 
 msgid "vote"
 msgstr ""
 

-#: ../IkiWiki/Plugin/poll.pm:77
+#: ../IkiWiki/Plugin/poll.pm:78

 msgid "Total votes:"
 msgstr ""
 
 msgid "Total votes:"
 msgstr ""
 

-#: ../IkiWiki/Plugin/polygen.pm:41
+#: ../IkiWiki/Plugin/polygen.pm:42

 msgid "polygen not installed"
 msgstr ""
 
 msgid "polygen not installed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/polygen.pm:60
+#: ../IkiWiki/Plugin/polygen.pm:61

 msgid "command failed"
 msgstr ""
 
 msgid "command failed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/postsparkline.pm:41
+#: ../IkiWiki/Plugin/postsparkline.pm:47

 msgid "missing formula"
 msgstr ""
 
 msgid "missing formula"
 msgstr ""
 

-#: ../IkiWiki/Plugin/postsparkline.pm:48
+#: ../IkiWiki/Plugin/postsparkline.pm:54

 msgid "unknown formula"
 msgstr ""
 
 msgid "unknown formula"
 msgstr ""
 


@@ -595,12 +766,12 @@ msgstr ""
 msgid "at noon on %A"
 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 ""
 
 #, 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 ""
 
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
 


@@ -608,40 +779,40 @@ msgstr ""
 msgid "(Diff truncated)"
 msgstr ""
 
 msgid "(Diff truncated)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37

 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 
 #, perl-format
 msgid "%s does not exist"
 msgstr ""
 

-#: ../IkiWiki/Plugin/remove.pm:38
+#: ../IkiWiki/Plugin/remove.pm:39

 #, perl-format
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr ""
 
 #, 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:42 ../IkiWiki/Plugin/rename.pm:46

 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 
 #, perl-format
 msgid "%s is not a file"
 msgstr ""
 

-#: ../IkiWiki/Plugin/remove.pm:115
+#: ../IkiWiki/Plugin/remove.pm:137

 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/remove.pm:152
+#: ../IkiWiki/Plugin/remove.pm:174

 msgid "Please select the attachments to remove."
 msgstr ""
 
 msgid "Please select the attachments to remove."
 msgstr ""
 

-#: ../IkiWiki/Plugin/remove.pm:192
+#: ../IkiWiki/Plugin/remove.pm:217

 msgid "removed"
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 msgid "no change to the file name was specified"
 msgstr ""
 


@@ -660,59 +831,65 @@ msgstr ""
 msgid "%s already exists on disk"
 msgstr ""
 
 msgid "%s already exists on disk"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:101
+#: ../IkiWiki/Plugin/rename.pm:122

 #, perl-format
 msgid "rename %s"
 msgstr ""
 
 #, perl-format
 msgid "rename %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:138
+#: ../IkiWiki/Plugin/rename.pm:163

 msgid "Also rename SubPages and attachments"
 msgstr ""
 
 msgid "Also rename SubPages and attachments"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:224
+#: ../IkiWiki/Plugin/rename.pm:250

 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:227
+#: ../IkiWiki/Plugin/rename.pm:253

 msgid "Please select the attachment to rename."
 msgstr ""
 
 msgid "Please select the attachment to rename."
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:338
+#: ../IkiWiki/Plugin/rename.pm:352

 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:490
+#: ../IkiWiki/Plugin/rename.pm:577

 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
 
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:36
+#: ../IkiWiki/Plugin/rsync.pm:37
+#, perl-format
+msgid "failed to execute rsync_command: %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/rsync.pm:40

 #, perl-format
 #, perl-format

-msgid "Must specify %s when using the search plugin"
+msgid "rsync_command exited %d"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:182
+#: ../IkiWiki/Plugin/search.pm:194

 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 
 #, perl-format
 msgid "need Digest::SHA1 to index %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:217
+#: ../IkiWiki/Plugin/search.pm:231

 msgid "search"
 msgstr ""
 
 msgid "search"
 msgstr ""
 

-#: ../IkiWiki/Plugin/shortcut.pm:28
-msgid "shortcut plugin will not work without a shortcuts.mdwn"
+#: ../IkiWiki/Plugin/shortcut.pm:32
+#, perl-format
+msgid "shortcut plugin will not work without %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/shortcut.pm:38
+#: ../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.
 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:48
+#: ../IkiWiki/Plugin/shortcut.pm:55

 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""


@@ -721,126 +898,121 @@ msgstr ""
 msgid "failed to parse any smileys"
 msgstr ""
 
 msgid "failed to parse any smileys"
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:72
+#: ../IkiWiki/Plugin/sparkline.pm:73

 msgid "parse error"
 msgstr ""
 
 msgid "parse error"
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#: ../IkiWiki/Plugin/sparkline.pm:79
+msgid "invalid featurepoint diameter"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#: ../IkiWiki/Plugin/sparkline.pm:89
+msgid "invalid featurepoint location"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:99
+#: ../IkiWiki/Plugin/sparkline.pm:100

 msgid "missing values"
 msgstr ""
 
 msgid "missing values"
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#: ../IkiWiki/Plugin/sparkline.pm:105
+msgid "invalid height value"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:111
+#: ../IkiWiki/Plugin/sparkline.pm:112

 msgid "missing width parameter"
 msgstr ""
 
 msgid "missing width parameter"
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#: ../IkiWiki/Plugin/sparkline.pm:116
+msgid "invalid width value"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/sparkline.pm:153
+#: ../IkiWiki/Plugin/sparkline.pm:154

 msgid "failed to run php"
 msgstr ""
 
 msgid "failed to run php"
 msgstr ""
 

-#: ../IkiWiki/Plugin/table.pm:31
+#: ../IkiWiki/Plugin/table.pm:32

 msgid "cannot find file"
 msgstr ""
 
 msgid "cannot find file"
 msgstr ""
 

-#: ../IkiWiki/Plugin/table.pm:73
+#: ../IkiWiki/Plugin/table.pm:88

 msgid "unknown data format"
 msgstr ""
 
 msgid "unknown data format"
 msgstr ""
 

-#: ../IkiWiki/Plugin/table.pm:81
+#: ../IkiWiki/Plugin/table.pm:96

 msgid "empty data"
 msgstr ""
 
 msgid "empty data"
 msgstr ""
 

-#: ../IkiWiki/Plugin/table.pm:100
+#: ../IkiWiki/Plugin/table.pm:115

 msgid "Direct data download"
 msgstr ""
 
 msgid "Direct data download"
 msgstr ""
 

-#: ../IkiWiki/Plugin/table.pm:134
+#: ../IkiWiki/Plugin/table.pm:149

 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
 
 #, perl-format
 msgid "parse fail at line %d: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/template.pm:28
-msgid "missing id parameter"
-msgstr ""
-
-#: ../IkiWiki/Plugin/template.pm:35
+#: ../IkiWiki/Plugin/tag.pm:83

 #, perl-format
 #, perl-format

-msgid "template %s not found"
+msgid "creating tag page %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/template.pm:54
-msgid "failed to process:"
+#: ../IkiWiki/Plugin/template.pm:33
+msgid "missing id parameter"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/teximg.pm:70
-msgid "missing tex code"
+#: ../IkiWiki/Plugin/template.pm:47
+#, perl-format
+msgid "%s not found"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/teximg.pm:77
-msgid "code includes disallowed latex commands"
+#: ../IkiWiki/Plugin/teximg.pm:72
+msgid "missing tex code"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/teximg.pm:128
+#: ../IkiWiki/Plugin/teximg.pm:124

 msgid "failed to generate image from code"
 msgstr ""
 
 msgid "failed to generate image from code"
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:89
-msgid "plugin"
+#: ../IkiWiki/Plugin/websetup.pm:105
+#, perl-format
+msgid "%s plugin:"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:108
+#: ../IkiWiki/Plugin/websetup.pm:121

 #, perl-format
 #, perl-format

-msgid "enable %s?"
+msgid "%s plugins"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:236
-msgid "you are not logged in as an admin"
+#: ../IkiWiki/Plugin/websetup.pm:135
+#, perl-format
+msgid "enable %s?"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:240
+#: ../IkiWiki/Plugin/websetup.pm:272

 msgid "setup file for this wiki is not known"
 msgstr ""
 
 msgid "setup file for this wiki is not known"
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:256
+#: ../IkiWiki/Plugin/websetup.pm:288

 msgid "main"
 msgstr ""
 
 msgid "main"
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:257
-msgid "plugins"
-msgstr ""
-
-#: ../IkiWiki/Plugin/websetup.pm:395
+#: ../IkiWiki/Plugin/websetup.pm:431

 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
 

-#: ../IkiWiki/Plugin/websetup.pm:399
+#: ../IkiWiki/Plugin/websetup.pm:435

 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
 
 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:472

 #, perl-format
 #, perl-format

-msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
+msgid "Error: %s exited nonzero (%s). Discarding setup changes."

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Receive.pm:35
+#: ../IkiWiki/Receive.pm:34

 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""
 #, perl-format
 msgid "cannot determine id of untrusted committer %s"
 msgstr ""


@@ -850,83 +1022,98 @@ msgstr ""
 msgid "bad file name %s"
 msgstr ""
 
 msgid "bad file name %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:253
+#: ../IkiWiki/Render.pm:158
+#, perl-format
+msgid "scanning %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:280

 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
 #, 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:316

 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:284
+#: ../IkiWiki/Render.pm:332

 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 

-#: ../IkiWiki/Render.pm:360
-#, perl-format
-msgid "removing old page %s"
-msgstr ""
-
-#: ../IkiWiki/Render.pm:400
+#: ../IkiWiki/Render.pm:372

 #, perl-format
 #, perl-format

-msgid "scanning %s"
+msgid "querying %s for file creation and modification times.."

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:405
+#: ../IkiWiki/Render.pm:446

 #, perl-format
 #, perl-format

-msgid "rendering %s"
+msgid "removing obsolete %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:426
+#: ../IkiWiki/Render.pm:520

 #, perl-format
 #, perl-format

-msgid "rendering %s, which links to %s"
+msgid "building %s, which links to %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:447
+#: ../IkiWiki/Render.pm:529

 #, perl-format
 #, perl-format

-msgid "rendering %s, which depends on %s"
+msgid "removing %s, no longer built by %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:486
+#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694

 #, perl-format
 #, perl-format

-msgid "rendering %s, to update its backlinks"
+msgid "building %s, which depends on %s"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:498
+#: ../IkiWiki/Render.pm:707

 #, perl-format
 #, perl-format

-msgid "removing %s, no longer rendered by %s"
+msgid "building %s, to update its backlinks"

 msgstr ""
 
 msgstr ""
 

-#: ../IkiWiki/Render.pm:522
+#: ../IkiWiki/Render.pm:836

 #, perl-format
 #, 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.
 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 ""
 
 #, perl-format
 msgid "cannot read %s: %s"
 msgstr ""
 

-#: ../IkiWiki/Setup/Automator.pm:33
+#: ../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 ""
 
 msgid "you must enter a wikiname (that contains alphanumerics)"
 msgstr ""
 

-#: ../IkiWiki/Setup/Automator.pm:67
+#: ../IkiWiki/Setup/Automator.pm:89

 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 
 #, perl-format
 msgid "unsupported revision control system %s"
 msgstr ""
 

-#: ../IkiWiki/Setup/Automator.pm:83
+#: ../IkiWiki/Setup/Automator.pm:115

 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 
 msgid "failed to set up the repository with ikiwiki-makerepo"
 msgstr ""
 

+#: ../IkiWiki/Setup/Automator.pm:134
+#, perl-format
+msgid "** Disabling plugin %s, since it is failing with this message:"
+msgstr ""
+

 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
 msgid "%s doesn't seem to be executable"
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
 msgid "%s doesn't seem to be executable"


@@ -940,21 +1127,14 @@ msgstr ""
 msgid "wrapper filename not specified"
 msgstr ""
 
 msgid "wrapper filename not specified"
 msgstr ""
 

-#. translators: The first parameter is a filename, and the second is
-#. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:97
-#, perl-format
-msgid "failed to write %s: %s"
-msgstr ""
-

 #. translators: The parameter is a C filename.
 #. translators: The parameter is a C filename.

-#: ../IkiWiki/Wrapper.pm:154
+#: ../IkiWiki/Wrapper.pm:160

 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.

-#: ../IkiWiki/Wrapper.pm:174
+#: ../IkiWiki/Wrapper.pm:180

 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""


@@ -967,44 +1147,67 @@ msgstr ""
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 
 msgid "       ikiwiki --setup configfile"
 msgstr ""
 

-#: ../ikiwiki.in:91
+#: ../ikiwiki.in:96

 msgid "usage: --set var=value"
 msgstr ""
 
 msgid "usage: --set var=value"
 msgstr ""
 

-#: ../ikiwiki.in:139
+#: ../ikiwiki.in:103
+msgid "usage: --set-yaml var=value"
+msgstr ""
+
+#: ../ikiwiki.in:157

 msgid "generating wrappers.."
 msgstr ""
 
 msgid "generating wrappers.."
 msgstr ""
 

-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:220

 msgid "rebuilding wiki.."
 msgstr ""
 
 msgid "rebuilding wiki.."
 msgstr ""
 

-#: ../ikiwiki.in:200
+#: ../ikiwiki.in:223

 msgid "refreshing wiki.."
 msgstr ""
 
 msgid "refreshing wiki.."
 msgstr ""
 

-#: ../IkiWiki.pm:480
+#: ../IkiWiki.pm:232
+msgid "Discussion"
+msgstr ""
+
+#: ../IkiWiki.pm:531

 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 

-#: ../IkiWiki.pm:526
+#: ../IkiWiki.pm:577

 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 

-#: ../IkiWiki.pm:555
+#: ../IkiWiki.pm:607

 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 

-#: ../IkiWiki.pm:1187
+#: ../IkiWiki.pm:1299

 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 

-#: ../IkiWiki.pm:1661
+#: ../IkiWiki.pm:1994

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

+#: ../IkiWiki.pm:2071
+#, perl-format
+msgid "invalid sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2092
+#, perl-format
+msgid "unknown sort type %s"
+msgstr ""
+
+#: ../IkiWiki.pm:2228
+#, perl-format
+msgid "cannot match pages: %s"
+msgstr ""
+

 #: ../auto.setup:16
 msgid "What will the wiki be named?"
 msgstr ""
 #: ../auto.setup:16
 msgid "What will the wiki be named?"
 msgstr ""


@@ -1013,14 +1216,14 @@ msgstr ""
 msgid "wiki"
 msgstr ""
 
 msgid "wiki"
 msgstr ""
 

-#: ../auto.setup:18
+#: ../auto.setup:19

 msgid "What revision control system to use?"
 msgstr ""
 
 msgid "What revision control system to use?"
 msgstr ""
 

-#: ../auto.setup:20
-msgid "What wiki user (or openid) will be wiki admin?"
+#: ../auto.setup:21
+msgid "Which user (wiki account or openid) will be admin?"

 msgstr ""
 
 msgstr ""
 

-#: ../auto.setup:23
+#: ../auto.setup:24

 msgid "What is the domain name of the web server?"
 msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""