msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-15 11:48-0400\n"
+"POT-Creation-Date: 2010-12-01 20:29-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"
msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:220
+#: ../IkiWiki/Plugin/aggregate.pm:222
#, perl-format
msgid "missing %s parameter"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:255
+#: ../IkiWiki/Plugin/aggregate.pm:257
msgid "new feed"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:269
+#: ../IkiWiki/Plugin/aggregate.pm:271
msgid "posts"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:273
msgid "new"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:455
+#: ../IkiWiki/Plugin/aggregate.pm:457
#, perl-format
msgid "expiring %s (%s days old)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:462
+#: ../IkiWiki/Plugin/aggregate.pm:464
#, perl-format
msgid "expiring %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:489
+#: ../IkiWiki/Plugin/aggregate.pm:491
#, perl-format
msgid "last checked %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:493
+#: ../IkiWiki/Plugin/aggregate.pm:495
#, perl-format
msgid "checking feed %s ..."
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:498
+#: ../IkiWiki/Plugin/aggregate.pm:500
#, perl-format
msgid "could not find feed at %s"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:517
+#: ../IkiWiki/Plugin/aggregate.pm:519
msgid "feed not found"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:528
+#: ../IkiWiki/Plugin/aggregate.pm:530
#, perl-format
msgid "(invalid UTF-8 stripped from feed)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:536
+#: ../IkiWiki/Plugin/aggregate.pm:538
#, perl-format
msgid "(feed entities escaped)"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:544
+#: ../IkiWiki/Plugin/aggregate.pm:546
msgid "feed crashed XML::Feed!"
msgstr ""
-#: ../IkiWiki/Plugin/aggregate.pm:630
+#: ../IkiWiki/Plugin/aggregate.pm:632
#, perl-format
msgid "creating new page %s"
msgstr ""
+#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:135
+msgid "failed to process template:"
+msgstr ""
+
#: ../IkiWiki/Plugin/amazon_s3.pm:31
msgid "deleting bucket.."
msgstr ""
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
msgid "done"
msgstr ""
msgid "automatic index generation"
msgstr ""
-#: ../IkiWiki/Plugin/blogspam.pm:110
+#: ../IkiWiki/Plugin/blogspam.pm:112
msgid ""
"Sorry, but that looks like spam to <a href=\"http://blogspam.net/"
"\">blogspam</a>: "
msgid "moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48
+#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50
#, perl-format
msgid "unsupported page format %s"
msgstr ""
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268
+#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269
msgid "you are not logged in as an admin"
msgstr ""
msgid "comment moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:822
+#: ../IkiWiki/Plugin/comments.pm:828
#, perl-format
msgid "%i comment"
msgid_plural "%i comments"
#. translators: Here "Comment" is a verb;
#. translators: the user clicks on it to
#. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:832
+#: ../IkiWiki/Plugin/comments.pm:838
msgid "Comment"
msgstr ""
-#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31
-#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
+#: ../IkiWiki/Plugin/conditional.pm:28 ../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:67
+#: ../IkiWiki/Plugin/cutpaste.pm:80
msgid "no text was copied in this page"
msgstr ""
-#: ../IkiWiki/Plugin/cutpaste.pm:70
+#: ../IkiWiki/Plugin/cutpaste.pm:83
#, perl-format
msgid "no text was copied in this page with id %s"
msgstr ""
msgid "editing %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:52
+#: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "template not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:55
+#: ../IkiWiki/Plugin/edittemplate.pm:57
msgid "match not specified"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:70
+#: ../IkiWiki/Plugin/edittemplate.pm:72
#, perl-format
msgid "edittemplate %s registered for %s"
msgstr ""
-#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339
-#: ../IkiWiki/Plugin/template.pm:44
-msgid "failed to process template:"
-msgstr ""
-
#: ../IkiWiki/Plugin/format.pm:30
msgid "must specify format and text"
msgstr ""
msgid "%s is an attachment, not a page."
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760
-#: ../IkiWiki/Receive.pm:129
+#: ../IkiWiki/Plugin/git.pm:766 ../IkiWiki/Plugin/git.pm:829
+#: ../IkiWiki.pm:1580
#, perl-format
msgid "you are not allowed to change %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:782
+#: ../IkiWiki/Plugin/git.pm:788
#, perl-format
msgid "you cannot act on a file with mode %s"
msgstr ""
-#: ../IkiWiki/Plugin/git.pm:786
+#: ../IkiWiki/Plugin/git.pm:792
msgid "you are not allowed to change file modes"
msgstr ""
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137
-#: ../IkiWiki/Plugin/search.pm:38
+#: ../IkiWiki/Plugin/git.pm:863
+msgid "you are not allowed to revert a merge"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:879
+#, perl-format
+msgid "Failed to revert commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38
#, perl-format
msgid "Must specify %s when using the %s plugin"
msgstr ""
msgid "prog not a valid graphviz program"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:48
+#: ../IkiWiki/Plugin/highlight.pm:64
#, perl-format
msgid "tohighlight contains unknown file type '%s'"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:59
+#: ../IkiWiki/Plugin/highlight.pm:75
#, perl-format
msgid "Source code: %s"
msgstr ""
-#: ../IkiWiki/Plugin/highlight.pm:124
+#: ../IkiWiki/Plugin/highlight.pm:155
msgid ""
"warning: highlight perl module not available; falling back to pass through"
msgstr ""
-#: ../IkiWiki/Plugin/htmltidy.pm:50
+#: ../IkiWiki/Plugin/htmltidy.pm:63
msgid "htmltidy failed to parse this html"
msgstr ""
msgid "Add a new post titled:"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:342
+#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44
#, perl-format
-msgid "template %s not found"
+msgid "failed to process template %s"
msgstr ""
-#: ../IkiWiki/Plugin/inline.pm:633
+#: ../IkiWiki/Plugin/inline.pm:663
msgid "RPC::XML::Client not found, not pinging"
msgstr ""
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:174
+#: ../IkiWiki/Plugin/meta.pm:175
msgid "stylesheet not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:212
+#: ../IkiWiki/Plugin/meta.pm:217
msgid "redir page not found"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:226
+#: ../IkiWiki/Plugin/meta.pm:231
msgid "redir cycle is not allowed"
msgstr ""
-#: ../IkiWiki/Plugin/meta.pm:395
+#: ../IkiWiki/Plugin/meta.pm:400
msgid "sort=meta requires a parameter"
msgstr ""
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:78
msgid "LWP not found, not pinging"
msgstr ""
msgid "warning: Old po4a detected! Recommend upgrade to 0.35."
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:147
-#, perl-format
-msgid "%s has invalid syntax: must use CODE|NAME"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:166
+#: ../IkiWiki/Plugin/po.pm:175
#, perl-format
msgid "%s is not a valid language code"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:178
+#: ../IkiWiki/Plugin/po.pm:187
#, 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:183
+#: ../IkiWiki/Plugin/po.pm:192
msgid ""
"po_link_to=negotiated requires usedirs to be enabled, falling back to "
"po_link_to=default"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:414
-#, perl-format
-msgid "rebuilding all pages to fix meta titles"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784
-#, perl-format
-msgid "building %s"
-msgstr ""
-
-#: ../IkiWiki/Plugin/po.pm:456
+#: ../IkiWiki/Plugin/po.pm:455
msgid "updated PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:479
+#: ../IkiWiki/Plugin/po.pm:478
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:499
+#: ../IkiWiki/Plugin/po.pm:498
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:924
+#: ../IkiWiki/Plugin/po.pm:935
#, perl-format
msgid "POT file (%s) does not exist"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:938
+#: ../IkiWiki/Plugin/po.pm:949
#, perl-format
msgid "failed to copy underlay PO file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:947
+#: ../IkiWiki/Plugin/po.pm:958
#, perl-format
msgid "failed to update %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:953
+#: ../IkiWiki/Plugin/po.pm:964
#, perl-format
msgid "failed to copy the POT file to %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:989
+#: ../IkiWiki/Plugin/po.pm:1000
msgid "N/A"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1000
+#: ../IkiWiki/Plugin/po.pm:1011
#, perl-format
msgid "failed to translate %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1079
+#: ../IkiWiki/Plugin/po.pm:1090
msgid "removed obsolete PO files"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148
-#: ../IkiWiki/Plugin/po.pm:1187
+#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159
+#: ../IkiWiki/Plugin/po.pm:1198
#, perl-format
msgid "failed to write %s"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1146
+#: ../IkiWiki/Plugin/po.pm:1157
msgid "failed to translate"
msgstr ""
-#: ../IkiWiki/Plugin/po.pm:1199
+#: ../IkiWiki/Plugin/po.pm:1210
msgid "invalid gettext data, go back to previous page to continue edit"
msgstr ""
+#: ../IkiWiki/Plugin/po.pm:1252
+#, perl-format
+msgid "%s has invalid syntax: must use CODE|NAME"
+msgstr ""
+
#: ../IkiWiki/Plugin/poll.pm:70
msgid "vote"
msgstr ""
msgid "need either `percent` or `totalpages` and `donepages` parameters"
msgstr ""
+#: ../IkiWiki/Plugin/recentchanges.pm:104
+#, perl-format
+msgid "This reverts commit %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/recentchanges.pm:123
+#, perl-format
+msgid "confirm reversion of %s"
+msgstr ""
+
#: ../IkiWiki/Plugin/recentchangesdiff.pm:37
msgid "(Diff truncated)"
msgstr ""
msgid "%s is not a file"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:137
+#: ../IkiWiki/Plugin/remove.pm:136
#, perl-format
msgid "confirm removal of %s"
msgstr ""
-#: ../IkiWiki/Plugin/remove.pm:174
+#: ../IkiWiki/Plugin/remove.pm:173
msgid "Please select the attachments to remove."
msgstr ""
msgid "%s already exists on disk"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:122
+#: ../IkiWiki/Plugin/rename.pm:123
#, perl-format
msgid "rename %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:163
+#: ../IkiWiki/Plugin/rename.pm:164
msgid "Also rename SubPages and attachments"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:250
+#: ../IkiWiki/Plugin/rename.pm:251
msgid "Only one attachment can be renamed at a time."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:253
+#: ../IkiWiki/Plugin/rename.pm:254
msgid "Please select the attachment to rename."
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:352
+#: ../IkiWiki/Plugin/rename.pm:353
#, perl-format
msgid "rename %s to %s"
msgstr ""
-#: ../IkiWiki/Plugin/rename.pm:577
+#: ../IkiWiki/Plugin/rename.pm:578
#, perl-format
msgid "update for rename of %s to %s"
msgstr ""
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 ""
msgid "missing id parameter"
msgstr ""
-#: ../IkiWiki/Plugin/template.pm:47
-#, perl-format
-msgid "%s not found"
-msgstr ""
-
-#: ../IkiWiki/Plugin/teximg.pm:72
+#: ../IkiWiki/Plugin/teximg.pm:73
msgid "missing tex code"
msgstr ""
-#: ../IkiWiki/Plugin/teximg.pm:124
+#: ../IkiWiki/Plugin/teximg.pm:125
msgid "failed to generate image from code"
msgstr ""
msgid "enable %s?"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:272
+#: ../IkiWiki/Plugin/websetup.pm:273
msgid "setup file for this wiki is not known"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:288
+#: ../IkiWiki/Plugin/websetup.pm:289
msgid "main"
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:431
+#: ../IkiWiki/Plugin/websetup.pm:433
msgid ""
"The configuration changes shown below require a wiki rebuild to take effect."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:435
+#: ../IkiWiki/Plugin/websetup.pm:437
msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
-#: ../IkiWiki/Plugin/websetup.pm:472
+#: ../IkiWiki/Plugin/websetup.pm:474
#, perl-format
msgid "Error: %s exited nonzero (%s). Discarding setup changes."
msgstr ""
msgid "cannot determine id of untrusted committer %s"
msgstr ""
-#: ../IkiWiki/Receive.pm:85
-#, perl-format
-msgid "bad file name %s"
-msgstr ""
-
#: ../IkiWiki/Render.pm:158
#, perl-format
msgid "scanning %s"
msgid "building %s, to update its backlinks"
msgstr ""
-#: ../IkiWiki/Render.pm:836
+#: ../IkiWiki/Render.pm:787
+#, perl-format
+msgid "building %s"
+msgstr ""
+
+#: ../IkiWiki/Render.pm:839
#, perl-format
msgid "ikiwiki: cannot build %s"
msgstr ""
msgstr ""
#. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:218
+#: ../IkiWiki/Wrapper.pm:219
#, perl-format
msgid "failed to compile %s"
msgstr ""
#. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:238
+#: ../IkiWiki/Wrapper.pm:239
#, perl-format
msgid "successfully generated %s"
msgstr ""
-#: ../ikiwiki.in:13
+#: ../ikiwiki.in:10
msgid "usage: ikiwiki [options] source dest"
msgstr ""
-#: ../ikiwiki.in:14
+#: ../ikiwiki.in:11
msgid " ikiwiki --setup configfile"
msgstr ""
-#: ../ikiwiki.in:105
+#: ../ikiwiki.in:102
msgid "usage: --set var=value"
msgstr ""
-#: ../ikiwiki.in:112
+#: ../ikiwiki.in:109
msgid "usage: --set-yaml var=value"
msgstr ""
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:215
msgid "rebuilding wiki.."
msgstr ""
-#: ../ikiwiki.in:221
+#: ../ikiwiki.in:218
msgid "refreshing wiki.."
msgstr ""
msgid "preprocessing loop detected on %s at depth %i"
msgstr ""
-#: ../IkiWiki.pm:2053
+#: ../IkiWiki.pm:1536
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
+#: ../IkiWiki.pm:1836
+#, perl-format
+msgid "template %s not found"
+msgstr ""
+
+#: ../IkiWiki.pm:2118
msgid "yes"
msgstr ""
-#: ../IkiWiki.pm:2130
+#: ../IkiWiki.pm:2195
#, perl-format
msgid "invalid sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2151
+#: ../IkiWiki.pm:2216
#, perl-format
msgid "unknown sort type %s"
msgstr ""
-#: ../IkiWiki.pm:2287
+#: ../IkiWiki.pm:2352
#, perl-format
msgid "cannot match pages: %s"
msgstr ""