urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a guard against multiple cgi or rcs wrappers

master
Joey Hess 2008-08-05 21:02:18 -04:00
parent ea6dc38325
commit 11a4ad8a4d
2 changed files with 178 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ikiwiki-transition
View File

@ -130,14 +130,24 @@ sub setupformat {
IkiWiki::checkconfig(); IkiWiki::checkconfig();
# unpack old-format wrappers setting into new fields # unpack old-format wrappers setting into new fields
my $cgi_seen=0;
my $rcs_seen=0;
foreach my $wrapper (@{$config{wrappers}}) { foreach my $wrapper (@{$config{wrappers}}) {
if ($wrapper->{cgi}) { if ($wrapper->{cgi}) {
if ($cgi_seen) {
die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
}
$cgi_seen++;
print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n"; print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
$config{cgi_wrapper}=$wrapper->{wrapper}; $config{cgi_wrapper}=$wrapper->{wrapper};
$config{cgi_wrappermode}=$wrapper->{wrappermode} $config{cgi_wrappermode}=$wrapper->{wrappermode}
if exists $wrapper->{wrappermode}; if exists $wrapper->{wrappermode};
} }
elsif ($config{rcs}) { elsif ($config{rcs}) {
if ($rcs_seen) {
die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
}
$rcs_seen++;
print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n"; print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper}; $config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode} $config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}

331
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-03 14:48-0400\n" "POT-Creation-Date: 2008-08-05 20:43-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -49,9 +49,9 @@ msgstr ""
msgid "%s is not an editable page" msgid "%s is not an editable page"
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:449 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/CGI.pm:449 ../IkiWiki/Plugin/brokenlinks.pm:33
#: ../IkiWiki/Plugin/inline.pm:306 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/inline.pm:310 ../IkiWiki/Plugin/opendiscussion.pm:26
#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:78 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:78
#: ../IkiWiki/Render.pm:148 #: ../IkiWiki/Render.pm:148
msgid "discussion" msgid "discussion"
msgstr "" msgstr ""
@ -71,79 +71,79 @@ msgstr ""
msgid "You are banned." msgid "You are banned."
msgstr "" msgstr ""
#: ../IkiWiki/CGI.pm:783 ../IkiWiki/CGI.pm:784 ../IkiWiki.pm:1108 #: ../IkiWiki/CGI.pm:783 ../IkiWiki/CGI.pm:784 ../IkiWiki.pm:1110
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:76 #: ../IkiWiki/Plugin/aggregate.pm:80
msgid "Aggregation triggered via web." msgid "Aggregation triggered via web."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:85 #: ../IkiWiki/Plugin/aggregate.pm:89
msgid "Nothing to do right now, all feeds are up-to-date!" msgid "Nothing to do right now, all feeds are up-to-date!"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:212 #: ../IkiWiki/Plugin/aggregate.pm:216
#, perl-format #, perl-format
msgid "missing %s parameter" msgid "missing %s parameter"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:246 #: ../IkiWiki/Plugin/aggregate.pm:250
msgid "new feed" msgid "new feed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:260 #: ../IkiWiki/Plugin/aggregate.pm:264
msgid "posts" msgid "posts"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:262 #: ../IkiWiki/Plugin/aggregate.pm:266
msgid "new" msgid "new"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:425 #: ../IkiWiki/Plugin/aggregate.pm:429
#, perl-format #, perl-format
msgid "expiring %s (%s days old)" msgid "expiring %s (%s days old)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:432 #: ../IkiWiki/Plugin/aggregate.pm:436
#, perl-format #, perl-format
msgid "expiring %s" msgid "expiring %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:459 #: ../IkiWiki/Plugin/aggregate.pm:463
#, perl-format #, perl-format
msgid "processed ok at %s" msgid "processed ok at %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:463 #: ../IkiWiki/Plugin/aggregate.pm:467
#, perl-format #, perl-format
msgid "checking feed %s ..." msgid "checking feed %s ..."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:468 #: ../IkiWiki/Plugin/aggregate.pm:472
#, perl-format #, perl-format
msgid "could not find feed at %s" msgid "could not find feed at %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:483 #: ../IkiWiki/Plugin/aggregate.pm:487
msgid "feed not found" msgid "feed not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:494 #: ../IkiWiki/Plugin/aggregate.pm:498
#, perl-format #, perl-format
msgid "(invalid UTF-8 stripped from feed)" msgid "(invalid UTF-8 stripped from feed)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:500 #: ../IkiWiki/Plugin/aggregate.pm:504
#, perl-format #, perl-format
msgid "(feed entities escaped)" msgid "(feed entities escaped)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:506 #: ../IkiWiki/Plugin/aggregate.pm:510
msgid "feed crashed XML::Feed!" msgid "feed crashed XML::Feed!"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/aggregate.pm:580 #: ../IkiWiki/Plugin/aggregate.pm:584
#, perl-format #, perl-format
msgid "creating new page %s" msgid "creating new page %s"
msgstr "" msgstr ""
@ -152,196 +152,196 @@ msgstr ""
msgid "deleting bucket.." msgid "deleting bucket.."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:193 #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:194
msgid "done" msgid "done"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/amazon_s3.pm:93 #: ../IkiWiki/Plugin/amazon_s3.pm:97
#, perl-format #, perl-format
msgid "Must specify %s" msgid "Must specify %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/amazon_s3.pm:132 #: ../IkiWiki/Plugin/amazon_s3.pm:136
msgid "Failed to create bucket in S3: " msgid "Failed to create bucket in S3: "
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/amazon_s3.pm:217 #: ../IkiWiki/Plugin/amazon_s3.pm:221
msgid "Failed to save file to S3: " msgid "Failed to save file to S3: "
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/amazon_s3.pm:239 #: ../IkiWiki/Plugin/amazon_s3.pm:243
msgid "Failed to delete file from S3: " msgid "Failed to delete file from S3: "
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/attachment.pm:42 #: ../IkiWiki/Plugin/attachment.pm:46
#, perl-format #, perl-format
msgid "there is already a page named %s" msgid "there is already a page named %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/attachment.pm:75 #: ../IkiWiki/Plugin/attachment.pm:79
msgid "prohibited by allowed_attachments" msgid "prohibited by allowed_attachments"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/attachment.pm:183 #: ../IkiWiki/Plugin/attachment.pm:187
msgid "bad attachment filename" msgid "bad attachment filename"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/attachment.pm:225 #: ../IkiWiki/Plugin/attachment.pm:229
msgid "attachment upload" msgid "attachment upload"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/autoindex.pm:65 #: ../IkiWiki/Plugin/autoindex.pm:74
msgid "automatic index generation" msgid "automatic index generation"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:40 #: ../IkiWiki/Plugin/brokenlinks.pm:49
#, perl-format #, perl-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/brokenlinks.pm:47 #: ../IkiWiki/Plugin/brokenlinks.pm:56
msgid "There are no broken links!" msgid "There are no broken links!"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/conditional.pm:18 ../IkiWiki/Plugin/cutpaste.pm:22 #: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:31
#: ../IkiWiki/Plugin/cutpaste.pm:37 ../IkiWiki/Plugin/cutpaste.pm:53 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62
#: ../IkiWiki/Plugin/testpagespec.pm:17 #: ../IkiWiki/Plugin/testpagespec.pm:26
#, perl-format #, perl-format
msgid "%s parameter is required" msgid "%s parameter is required"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/cutpaste.pm:58 #: ../IkiWiki/Plugin/cutpaste.pm:67
msgid "no text was copied in this page" msgid "no text was copied in this page"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/cutpaste.pm:61 #: ../IkiWiki/Plugin/cutpaste.pm:70
#, perl-format #, perl-format
msgid "no text was copied in this page with id %s" msgid "no text was copied in this page with id %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/edittemplate.pm:41 #: ../IkiWiki/Plugin/edittemplate.pm:51
msgid "template not specified" msgid "template not specified"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/edittemplate.pm:44 #: ../IkiWiki/Plugin/edittemplate.pm:54
msgid "match not specified" msgid "match not specified"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/edittemplate.pm:49 #: ../IkiWiki/Plugin/edittemplate.pm:59
#, perl-format #, perl-format
msgid "edittemplate %s registered for %s" msgid "edittemplate %s registered for %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/edittemplate.pm:113 #: ../IkiWiki/Plugin/edittemplate.pm:123
msgid "failed to process" msgid "failed to process"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/fortune.pm:18 #: ../IkiWiki/Plugin/fortune.pm:27
msgid "fortune failed" msgid "fortune failed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/googlecalendar.pm:22 #: ../IkiWiki/Plugin/googlecalendar.pm:32
msgid "failed to find url in html" msgid "failed to find url in html"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/graphviz.pm:58 #: ../IkiWiki/Plugin/graphviz.pm:67
msgid "failed to run graphviz" msgid "failed to run graphviz"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/graphviz.pm:85 #: ../IkiWiki/Plugin/graphviz.pm:94
msgid "prog not a valid graphviz program" msgid "prog not a valid graphviz program"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/img.pm:53 #: ../IkiWiki/Plugin/img.pm:62
msgid "Image::Magick is not installed" msgid "Image::Magick is not installed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/img.pm:60 #: ../IkiWiki/Plugin/img.pm:69
#, perl-format #, perl-format
msgid "bad size \"%s\"" msgid "bad size \"%s\""
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/img.pm:70 ../IkiWiki/Plugin/img.pm:74 #: ../IkiWiki/Plugin/img.pm:79 ../IkiWiki/Plugin/img.pm:83
#: ../IkiWiki/Plugin/img.pm:91 #: ../IkiWiki/Plugin/img.pm:100
#, perl-format #, perl-format
msgid "failed to read %s: %s" msgid "failed to read %s: %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/img.pm:77 #: ../IkiWiki/Plugin/img.pm:86
#, perl-format #, perl-format
msgid "failed to resize: %s" msgid "failed to resize: %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/img.pm:108 #: ../IkiWiki/Plugin/img.pm:117
#, perl-format #, perl-format
msgid "failed to determine size of image %s" msgid "failed to determine size of image %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:89 #: ../IkiWiki/Plugin/inline.pm:93
msgid "Must specify url to wiki with --url when using --rss or --atom" msgid "Must specify url to wiki with --url when using --rss or --atom"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:146 #: ../IkiWiki/Plugin/inline.pm:150
msgid "missing pages parameter" msgid "missing pages parameter"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:194 #: ../IkiWiki/Plugin/inline.pm:198
#, perl-format #, perl-format
msgid "unknown sort type %s" msgid "unknown sort type %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:265 #: ../IkiWiki/Plugin/inline.pm:269
msgid "Add a new post titled:" msgid "Add a new post titled:"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:281 #: ../IkiWiki/Plugin/inline.pm:285
#, perl-format #, perl-format
msgid "nonexistant template %s" msgid "nonexistant template %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:314 ../IkiWiki/Render.pm:82 #: ../IkiWiki/Plugin/inline.pm:318 ../IkiWiki/Render.pm:82
msgid "Discussion" msgid "Discussion"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/inline.pm:551 #: ../IkiWiki/Plugin/inline.pm:555
msgid "RPC::XML::Client not found, not pinging" msgid "RPC::XML::Client not found, not pinging"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/linkmap.pm:97 #: ../IkiWiki/Plugin/linkmap.pm:106
msgid "failed to run dot" msgid "failed to run dot"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/lockedit.pm:42 ../IkiWiki/Plugin/lockedit.pm:56 #: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60
#, perl-format #, perl-format
msgid "%s is locked and cannot be edited" msgid "%s is locked and cannot be edited"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mdwn.pm:40 #: ../IkiWiki/Plugin/mdwn.pm:44
msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mdwn.pm:63 #: ../IkiWiki/Plugin/mdwn.pm:67
#, perl-format #, perl-format
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:141 #: ../IkiWiki/Plugin/meta.pm:150
msgid "stylesheet not found" msgid "stylesheet not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:175 #: ../IkiWiki/Plugin/meta.pm:184
msgid "redir page not found" msgid "redir page not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/meta.pm:188 #: ../IkiWiki/Plugin/meta.pm:197
msgid "redir cycle is not allowed" msgid "redir cycle is not allowed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mirrorlist.pm:35 #: ../IkiWiki/Plugin/mirrorlist.pm:39
msgid "Mirrors" msgid "Mirrors"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mirrorlist.pm:35 #: ../IkiWiki/Plugin/mirrorlist.pm:39
msgid "Mirror" msgid "Mirror"
msgstr "" msgstr ""
@ -349,97 +349,97 @@ msgstr ""
msgid "more" msgid "more"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/norcs.pm:55 #: ../IkiWiki/Plugin/norcs.pm:65
msgid "getctime not implemented" msgid "getctime not implemented"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/openid.pm:57 #: ../IkiWiki/Plugin/openid.pm:61
msgid "Log in with" msgid "Log in with"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/openid.pm:60 #: ../IkiWiki/Plugin/openid.pm:64
msgid "Get an OpenID" msgid "Get an OpenID"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/orphans.pm:42 #: ../IkiWiki/Plugin/orphans.pm:51
msgid "All pages are linked to by other pages." msgid "All pages are linked to by other pages."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pagetemplate.pm:21 #: ../IkiWiki/Plugin/pagetemplate.pm:30
msgid "bad or missing template" msgid "bad or missing template"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:243 #: ../IkiWiki/Plugin/passwordauth.pm:247
msgid "Account creation successful. Now you can Login." msgid "Account creation successful. Now you can Login."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:246 #: ../IkiWiki/Plugin/passwordauth.pm:250
msgid "Error creating account." msgid "Error creating account."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:253 #: ../IkiWiki/Plugin/passwordauth.pm:257
msgid "No email address, so cannot email password reset instructions." msgid "No email address, so cannot email password reset instructions."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:287 #: ../IkiWiki/Plugin/passwordauth.pm:291
msgid "Failed to send mail" msgid "Failed to send mail"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:289 #: ../IkiWiki/Plugin/passwordauth.pm:293
msgid "You have been mailed password reset instructions." msgid "You have been mailed password reset instructions."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:324 #: ../IkiWiki/Plugin/passwordauth.pm:328
msgid "incorrect password reset url" msgid "incorrect password reset url"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/passwordauth.pm:327 #: ../IkiWiki/Plugin/passwordauth.pm:331
msgid "password reset denied" msgid "password reset denied"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pingee.pm:21 #: ../IkiWiki/Plugin/pingee.pm:30
msgid "Ping received." msgid "Ping received."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pinger.pm:49 #: ../IkiWiki/Plugin/pinger.pm:53
msgid "requires 'from' and 'to' parameters" msgid "requires 'from' and 'to' parameters"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pinger.pm:54 #: ../IkiWiki/Plugin/pinger.pm:58
#, perl-format #, perl-format
msgid "Will ping %s" msgid "Will ping %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pinger.pm:57 #: ../IkiWiki/Plugin/pinger.pm:61
#, perl-format #, perl-format
msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgid "Ignoring ping directive for wiki %s (this wiki is %s)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/pinger.pm:73 #: ../IkiWiki/Plugin/pinger.pm:77
msgid "LWP not found, not pinging" msgid "LWP not found, not pinging"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/poll.pm:60 #: ../IkiWiki/Plugin/poll.pm:69
msgid "vote" msgid "vote"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/poll.pm:68 #: ../IkiWiki/Plugin/poll.pm:77
msgid "Total votes:" msgid "Total votes:"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/polygen.pm:32 #: ../IkiWiki/Plugin/polygen.pm:41
msgid "polygen not installed" msgid "polygen not installed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/polygen.pm:51 #: ../IkiWiki/Plugin/polygen.pm:60
msgid "command failed" msgid "command failed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/postsparkline.pm:32 #: ../IkiWiki/Plugin/postsparkline.pm:41
msgid "missing formula" msgid "missing formula"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/postsparkline.pm:39 #: ../IkiWiki/Plugin/postsparkline.pm:48
msgid "unknown formula" msgid "unknown formula"
msgstr "" msgstr ""
@ -495,252 +495,257 @@ msgstr ""
msgid "%A night" msgid "%A night"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/prettydate.pm:97 #: ../IkiWiki/Plugin/prettydate.pm:101
msgid "at teatime on %A" msgid "at teatime on %A"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/prettydate.pm:101 #: ../IkiWiki/Plugin/prettydate.pm:105
msgid "at midnight" msgid "at midnight"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/prettydate.pm:104 #: ../IkiWiki/Plugin/prettydate.pm:108
msgid "at noon on %A" msgid "at noon on %A"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/recentchanges.pm:95 #: ../IkiWiki/Plugin/recentchanges.pm:99
msgid "missing page" msgid "missing page"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/recentchanges.pm:97 #: ../IkiWiki/Plugin/recentchanges.pm:101
#, perl-format #, perl-format
msgid "The page %s does not exist." msgid "The page %s does not exist."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/recentchangesdiff.pm:26 #: ../IkiWiki/Plugin/recentchangesdiff.pm:36
msgid "(Diff truncated)" msgid "(Diff truncated)"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:23 ../IkiWiki/Plugin/rename.pm:26 #: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:35
#, perl-format #, perl-format
msgid "%s does not exist" msgid "%s does not exist"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:30 #: ../IkiWiki/Plugin/remove.pm:39
#, perl-format #, perl-format
msgid "%s is not in the srcdir, so it cannot be deleted" msgid "%s is not in the srcdir, so it cannot be deleted"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:33 ../IkiWiki/Plugin/rename.pm:35 #: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:44
#, perl-format #, perl-format
msgid "%s is not a file" msgid "%s is not a file"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:100 #: ../IkiWiki/Plugin/remove.pm:109
#, perl-format #, perl-format
msgid "confirm removal of %s" msgid "confirm removal of %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:136 #: ../IkiWiki/Plugin/remove.pm:145
msgid "Please select the attachments to remove." msgid "Please select the attachments to remove."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/remove.pm:176 #: ../IkiWiki/Plugin/remove.pm:185
msgid "removed" msgid "removed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:32 #: ../IkiWiki/Plugin/rename.pm:41
#, perl-format #, perl-format
msgid "%s is not in the srcdir, so it cannot be renamed" msgid "%s is not in the srcdir, so it cannot be renamed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:47 #: ../IkiWiki/Plugin/rename.pm:56
msgid "no change to the file name was specified" msgid "no change to the file name was specified"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:53 #: ../IkiWiki/Plugin/rename.pm:62
#, perl-format #, perl-format
msgid "illegal name" msgid "illegal name"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:58 #: ../IkiWiki/Plugin/rename.pm:67
#, perl-format #, perl-format
msgid "%s already exists" msgid "%s already exists"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:64 #: ../IkiWiki/Plugin/rename.pm:73
#, perl-format #, perl-format
msgid "%s already exists on disk" msgid "%s already exists on disk"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:86 #: ../IkiWiki/Plugin/rename.pm:95
#, perl-format #, perl-format
msgid "rename %s" msgid "rename %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:179 #: ../IkiWiki/Plugin/rename.pm:188
msgid "Only one attachment can be renamed at a time." msgid "Only one attachment can be renamed at a time."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:182 #: ../IkiWiki/Plugin/rename.pm:191
msgid "Please select the attachment to rename." msgid "Please select the attachment to rename."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:246 #: ../IkiWiki/Plugin/rename.pm:255
#, perl-format #, perl-format
msgid "rename %s to %s" msgid "rename %s to %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/rename.pm:274 #: ../IkiWiki/Plugin/rename.pm:283
#, perl-format #, perl-format
msgid "update for rename of %s to %s" msgid "update for rename of %s to %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/search.pm:32 #: ../IkiWiki/Plugin/search.pm:36
#, perl-format #, perl-format
msgid "Must specify %s when using the search plugin" msgid "Must specify %s when using the search plugin"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/search.pm:178 #: ../IkiWiki/Plugin/search.pm:182
#, perl-format #, perl-format
msgid "need Digest::SHA1 to index %s" msgid "need Digest::SHA1 to index %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/search.pm:213 #: ../IkiWiki/Plugin/search.pm:217
msgid "search" msgid "search"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/shortcut.pm:18 #: ../IkiWiki/Plugin/shortcut.pm:27
msgid "shortcut plugin will not work without a shortcuts.mdwn" msgid "shortcut plugin will not work without a shortcuts.mdwn"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/shortcut.pm:27 #: ../IkiWiki/Plugin/shortcut.pm:36
msgid "missing name or url parameter" msgid "missing name or url parameter"
msgstr "" msgstr ""
#. translators: This is used to display what shortcuts are defined. #. translators: This is used to display what shortcuts are defined.
#. translators: First parameter is the name of the shortcut, the second #. translators: First parameter is the name of the shortcut, the second
#. translators: is an URL. #. translators: is an URL.
#: ../IkiWiki/Plugin/shortcut.pm:36 #: ../IkiWiki/Plugin/shortcut.pm:45
#, perl-format #, perl-format
msgid "shortcut %s points to <i>%s</i>" msgid "shortcut %s points to <i>%s</i>"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/smiley.pm:32 #: ../IkiWiki/Plugin/smiley.pm:43
msgid "failed to parse any smileys" msgid "failed to parse any smileys"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:63 #: ../IkiWiki/Plugin/sparkline.pm:72
msgid "parse error" msgid "parse error"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:69 #: ../IkiWiki/Plugin/sparkline.pm:78
msgid "bad featurepoint diameter" msgid "bad featurepoint diameter"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:79 #: ../IkiWiki/Plugin/sparkline.pm:88
msgid "bad featurepoint location" msgid "bad featurepoint location"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:90 #: ../IkiWiki/Plugin/sparkline.pm:99
msgid "missing values" msgid "missing values"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:95 #: ../IkiWiki/Plugin/sparkline.pm:104
msgid "bad height value" msgid "bad height value"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:102 #: ../IkiWiki/Plugin/sparkline.pm:111
msgid "missing width parameter" msgid "missing width parameter"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:106 #: ../IkiWiki/Plugin/sparkline.pm:115
msgid "bad width value" msgid "bad width value"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/sparkline.pm:144 #: ../IkiWiki/Plugin/sparkline.pm:153
msgid "failed to run php" msgid "failed to run php"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/table.pm:22 #: ../IkiWiki/Plugin/table.pm:31
msgid "cannot find file" msgid "cannot find file"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/table.pm:64 #: ../IkiWiki/Plugin/table.pm:73
msgid "unknown data format" msgid "unknown data format"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/table.pm:72 #: ../IkiWiki/Plugin/table.pm:81
msgid "empty data" msgid "empty data"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/table.pm:92 #: ../IkiWiki/Plugin/table.pm:101
msgid "Direct data download" msgid "Direct data download"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/table.pm:126 #: ../IkiWiki/Plugin/table.pm:135
#, perl-format #, perl-format
msgid "parse fail at line %d: %s" msgid "parse fail at line %d: %s"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/template.pm:19 #: ../IkiWiki/Plugin/template.pm:28
msgid "missing id parameter" msgid "missing id parameter"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/template.pm:26 #: ../IkiWiki/Plugin/template.pm:35
#, perl-format #, perl-format
msgid "template %s not found" msgid "template %s not found"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/template.pm:45 #: ../IkiWiki/Plugin/template.pm:54
msgid "failed to process:" msgid "failed to process:"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/teximg.pm:30 #: ../IkiWiki/Plugin/teximg.pm:39
msgid "missing tex code" msgid "missing tex code"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/teximg.pm:37 #: ../IkiWiki/Plugin/teximg.pm:46
msgid "code includes disallowed latex commands" msgid "code includes disallowed latex commands"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/teximg.pm:88 #: ../IkiWiki/Plugin/teximg.pm:97
msgid "failed to generate image from code" msgid "failed to generate image from code"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:85 #: ../IkiWiki/Plugin/websetup.pm:89
msgid "plugin" msgid "plugin"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:85 #: ../IkiWiki/Plugin/websetup.pm:108
msgid "main"
msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:170
msgid ""
"Note: Disabled options cannot be configured here, but only by editing the "
"setup file."
msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:198
#, perl-format #, perl-format
msgid "enable %s?" msgid "enable %s?"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:212 #: ../IkiWiki/Plugin/websetup.pm:236
msgid "you are not logged in as an admin" msgid "you are not logged in as an admin"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:266 #: ../IkiWiki/Plugin/websetup.pm:240
msgid "other plugins" msgid "setup file for this wiki is not known"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:317 #: ../IkiWiki/Plugin/websetup.pm:256
msgid "main"
msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:257
msgid "plugins"
msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:395
msgid "" msgid ""
"The configuration changes shown below require a wiki rebuild to take effect." "The configuration changes shown below require a wiki rebuild to take effect."
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:329 #: ../IkiWiki/Plugin/websetup.pm:399
msgid "Setup saved." msgid ""
"For the configuration changes shown below to fully take effect, you may need "
"to rebuild the wiki."
msgstr ""
#: ../IkiWiki/Plugin/websetup.pm:433
#, perl-format
msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
msgstr "" msgstr ""
#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297
@ -790,7 +795,7 @@ msgstr ""
#. translators: The first parameter is a filename, and the second #. translators: The first parameter is a filename, and the second
#. translators: is a (probably not translated) error message. #. translators: is a (probably not translated) error message.
#: ../IkiWiki/Setup.pm:17 #: ../IkiWiki/Setup.pm:19
#, perl-format #, perl-format
msgid "cannot read %s: %s" msgid "cannot read %s: %s"
msgstr "" msgstr ""
@ -835,15 +840,15 @@ msgstr ""
msgid "usage: --set var=value" msgid "usage: --set var=value"
msgstr "" msgstr ""
#: ../ikiwiki.in:126 #: ../ikiwiki.in:127
msgid "generating wrappers.." msgid "generating wrappers.."
msgstr "" msgstr ""
#: ../ikiwiki.in:182 #: ../ikiwiki.in:183
msgid "rebuilding wiki.." msgid "rebuilding wiki.."
msgstr "" msgstr ""
#: ../ikiwiki.in:185 #: ../ikiwiki.in:186
msgid "refreshing wiki.." msgid "refreshing wiki.."
msgstr "" msgstr ""
@ -855,11 +860,11 @@ msgstr ""
msgid "cannot use multiple rcs plugins" msgid "cannot use multiple rcs plugins"
msgstr "" msgstr ""
#: ../IkiWiki.pm:1091 #: ../IkiWiki.pm:1093
#, perl-format #, perl-format
msgid "preprocessing loop detected on %s at depth %i" msgid "preprocessing loop detected on %s at depth %i"
msgstr "" msgstr ""
#: ../IkiWiki.pm:1579 #: ../IkiWiki.pm:1581
msgid "yes" msgid "yes"
msgstr "" msgstr ""