X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/53b10a64f0884dcd62924fe5750838c63211f992..7586f5165e36ca010d14ad87202ad923ca63144b:/po/ikiwiki.pot

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index f13acc8fb..f515d7fd2 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-21 09:43+0000\n"
+"POT-Creation-Date: 2016-12-29 20:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,41 +18,41 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../IkiWiki/CGI.pm:222
+#: ../IkiWiki/CGI.pm:217
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:225
+#: ../IkiWiki/CGI.pm:220
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:244 ../IkiWiki/CGI.pm:399
+#: ../IkiWiki/CGI.pm:239 ../IkiWiki/CGI.pm:394
 msgid "Your login session has expired."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:265
+#: ../IkiWiki/CGI.pm:260
 msgid "Login"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:266
+#: ../IkiWiki/CGI.pm:261
 msgid "Preferences"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:267
+#: ../IkiWiki/CGI.pm:262
 msgid "Admin"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:307
+#: ../IkiWiki/CGI.pm:302
 msgid "Preferences saved."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:362
+#: ../IkiWiki/CGI.pm:357
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:492 ../IkiWiki/CGI.pm:493 ../IkiWiki.pm:1651
+#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:491 ../IkiWiki.pm:1653
 msgid "Error"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:225
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
 msgid "done"
 msgstr ""
 
@@ -244,66 +244,66 @@ msgstr ""
 msgid "Comment Moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:381 ../IkiWiki/Plugin/comments.pm:385
+#: ../IkiWiki/Plugin/comments.pm:382 ../IkiWiki/Plugin/comments.pm:386
 msgid "email replies to me"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:419 ../IkiWiki/Plugin/editpage.pm:96
+#: ../IkiWiki/Plugin/comments.pm:420 ../IkiWiki/Plugin/editpage.pm:96
 #: ../IkiWiki/Plugin/editpage.pm:102
 msgid "bad page name"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:422
+#: ../IkiWiki/Plugin/comments.pm:423
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:439
+#: ../IkiWiki/Plugin/comments.pm:440
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:449
+#: ../IkiWiki/Plugin/comments.pm:450
 #, perl-format
 msgid "comments on page '%s' are not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:456
+#: ../IkiWiki/Plugin/comments.pm:457
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:583
+#: ../IkiWiki/Plugin/comments.pm:585
 msgid "comment stored for moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:585
+#: ../IkiWiki/Plugin/comments.pm:587
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:598
+#: ../IkiWiki/Plugin/comments.pm:600
 msgid "Added a comment"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:602
+#: ../IkiWiki/Plugin/comments.pm:604
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:676 ../IkiWiki/Plugin/userlist.pm:55
+#: ../IkiWiki/Plugin/comments.pm:678 ../IkiWiki/Plugin/userlist.pm:55
 #: ../IkiWiki/Plugin/websetup.pm:272
 msgid "you are not logged in as an admin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:735
+#: ../IkiWiki/Plugin/comments.pm:737
 msgid "Comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:776
+#: ../IkiWiki/Plugin/comments.pm:778
 msgid "comment moderation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/comments.pm:941
+#: ../IkiWiki/Plugin/comments.pm:943
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
@@ -313,7 +313,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:951
+#: ../IkiWiki/Plugin/comments.pm:953
 msgid "Comment"
 msgstr ""
 
@@ -347,14 +347,14 @@ msgstr ""
 msgid "email comments to me"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:319
+#: ../IkiWiki/Plugin/editpage.pm:320
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:337 ../IkiWiki/Plugin/editpage.pm:356
-#: ../IkiWiki/Plugin/editpage.pm:367 ../IkiWiki/Plugin/editpage.pm:414
-#: ../IkiWiki/Plugin/editpage.pm:456
+#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:357
+#: ../IkiWiki/Plugin/editpage.pm:368 ../IkiWiki/Plugin/editpage.pm:415
+#: ../IkiWiki/Plugin/editpage.pm:457
 #, perl-format
 msgid "editing %s"
 msgstr ""
@@ -418,25 +418,25 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:866 ../IkiWiki/Plugin/git.pm:929 ../IkiWiki.pm:1871
+#: ../IkiWiki/Plugin/git.pm:929 ../IkiWiki/Plugin/git.pm:992 ../IkiWiki.pm:1873
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:888
+#: ../IkiWiki/Plugin/git.pm:951
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:892
+#: ../IkiWiki/Plugin/git.pm:955
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:962
+#: ../IkiWiki/Plugin/git.pm:1029
 msgid "you are not allowed to revert a merge"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:981
+#: ../IkiWiki/Plugin/git.pm:1083 ../IkiWiki/Plugin/git.pm:1103
 #, perl-format
 msgid "Failed to revert commit %s"
 msgstr ""
@@ -473,31 +473,46 @@ msgstr ""
 msgid "htmltidy failed to parse this html"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:75
-msgid "Image::Magick is not installed"
+#: ../IkiWiki/Plugin/img.pm:96
+msgid "Unable to detect image type from extension"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:125
+#: ../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:83
+#: ../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:172
+msgid "Image::Magick is not installed"
+msgstr ""
+
+#: ../IkiWiki/Plugin/img.pm:178
 #, perl-format
 msgid "failed to get dimensions of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:93
+#: ../IkiWiki/Plugin/img.pm:185
 #, perl-format
 msgid "wrong size format \"%s\" (should be WxH)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:129
+#: ../IkiWiki/Plugin/img.pm:221
 #, perl-format
 msgid "failed to resize: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/img.pm:154
+#: ../IkiWiki/Plugin/img.pm:246
 #, perl-format
 msgid "failed to determine size of image %s"
 msgstr ""
@@ -506,39 +521,43 @@ msgstr ""
 msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:139
+#: ../IkiWiki/Plugin/inline.pm:125
+msgid "please enter a page title"
+msgstr ""
+
+#: ../IkiWiki/Plugin/inline.pm:142
 msgid "page editing not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:156
+#: ../IkiWiki/Plugin/inline.pm:159
 msgid "missing pages parameter"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:228
+#: ../IkiWiki/Plugin/inline.pm:231
 #, perl-format
 msgid "the %s and %s parameters cannot be used together"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:334
+#: ../IkiWiki/Plugin/inline.pm:337
 #, perl-format
 msgid "%s (RSS feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:338
+#: ../IkiWiki/Plugin/inline.pm:341
 #, perl-format
 msgid "%s (Atom feed)"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:371
+#: ../IkiWiki/Plugin/inline.pm:374
 msgid "Add a new post titled:"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:412 ../IkiWiki/Plugin/template.pm:46
+#: ../IkiWiki/Plugin/inline.pm:415 ../IkiWiki/Plugin/template.pm:46
 #, perl-format
 msgid "failed to process template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:752
+#: ../IkiWiki/Plugin/inline.pm:755
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -560,15 +579,15 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: ../IkiWiki/Plugin/loginselector.pm:107
+#: ../IkiWiki/Plugin/loginselector.pm:106
 msgid "Password"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:52
+#: ../IkiWiki/Plugin/mdwn.pm:53
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/mdwn.pm:97
+#: ../IkiWiki/Plugin/mdwn.pm:98
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
 msgstr ""
@@ -956,24 +975,24 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:164
+#: ../IkiWiki/Plugin/rename.pm:165
 msgid "Also rename SubPages and attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:266
+#: ../IkiWiki/Plugin/rename.pm:267
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:269
+#: ../IkiWiki/Plugin/rename.pm:270
 msgid "Please select the attachment to rename."
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:379
+#: ../IkiWiki/Plugin/rename.pm:380
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/rename.pm:605
+#: ../IkiWiki/Plugin/rename.pm:606
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
@@ -1182,7 +1201,7 @@ msgstr ""
 
 #: ../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:439
@@ -1277,43 +1296,43 @@ msgstr ""
 msgid "wrapper filename not specified"
 msgstr ""
 
-#: ../IkiWiki/Wrapper.pm:122
+#: ../IkiWiki/Wrapper.pm:120
 msgid "Please wait"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:288
+#: ../IkiWiki/Wrapper.pm:301
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:308
+#: ../IkiWiki/Wrapper.pm:321
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
 
-#: ../ikiwiki.in:10
+#: ../ikiwiki.in:11
 msgid "usage: ikiwiki [options] source dest"
 msgstr ""
 
-#: ../ikiwiki.in:11
+#: ../ikiwiki.in:12
 msgid "       ikiwiki --setup my.setup [options]"
 msgstr ""
 
-#: ../ikiwiki.in:102
+#: ../ikiwiki.in:103
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:109
+#: ../ikiwiki.in:110
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:214
+#: ../ikiwiki.in:215
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:217
+#: ../ikiwiki.in:218
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1344,31 +1363,31 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1827
+#: ../IkiWiki.pm:1829
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2140
+#: ../IkiWiki.pm:2142
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki.pm:2398
+#: ../IkiWiki.pm:2400
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2483
+#: ../IkiWiki.pm:2485
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2504
+#: ../IkiWiki.pm:2506
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2653
+#: ../IkiWiki.pm:2655
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""