From: Simon McVittie Date: Thu, 21 Jan 2016 09:53:28 +0000 (+0000) Subject: 3.20160121 X-Git-Tag: 3.20160121^0 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/53b10a64f0884dcd62924fe5750838c63211f992?ds=sidebyside 3.20160121 --- diff --git a/debian/changelog b/debian/changelog index f3b65bd30..d8044c465 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20150615) UNRELEASED; urgency=medium +ikiwiki (3.20160121) unstable; urgency=medium [ Amitai Schlair ] * meta: Fix [[!meta name=foo]] by closing the open quote. @@ -47,7 +47,7 @@ ikiwiki (3.20150615) UNRELEASED; urgency=medium * img test: skip testing PDFs if unsupported * img test: use the right filenames when testing that deletion occurs - -- Simon McVittie Mon, 15 Jun 2015 18:13:23 +0100 + -- Simon McVittie Thu, 21 Jan 2016 09:53:07 +0000 ikiwiki (3.20150614) unstable; urgency=medium diff --git a/ikiwiki.spec b/ikiwiki.spec index 855f7300b..6de6cb27c 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20150615 +Version: 3.20160121 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 864383342..f13acc8fb 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: 2015-06-09 22:32+0100\n" +"POT-Creation-Date: 2016-01-21 09:43+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,7 +52,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:491 ../IkiWiki.pm:1652 +#: ../IkiWiki/CGI.pm:492 ../IkiWiki/CGI.pm:493 ../IkiWiki.pm:1651 msgid "Error" msgstr "" @@ -124,12 +124,12 @@ msgstr "" msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:652 +#: ../IkiWiki/Plugin/aggregate.pm:654 #, perl-format msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:682 ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/aggregate.pm:684 ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process template:" msgstr "" @@ -303,7 +303,7 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:939 +#: ../IkiWiki/Plugin/comments.pm:941 #, 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:949 +#: ../IkiWiki/Plugin/comments.pm:951 msgid "Comment" msgstr "" @@ -372,21 +372,21 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:55 +#: ../IkiWiki/Plugin/emailauth.pm:61 msgid "Invalid email address." msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:90 ../IkiWiki/Plugin/passwordauth.pm:377 +#: ../IkiWiki/Plugin/emailauth.pm:98 ../IkiWiki/Plugin/passwordauth.pm:377 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:92 +#: ../IkiWiki/Plugin/emailauth.pm:100 msgid "" "You have been sent an email, with a link you can open to complete the login " "process." msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:109 +#: ../IkiWiki/Plugin/emailauth.pm:117 msgid "" "Wrong login token length. Please check that you pasted in the complete login " "link from the email!" @@ -418,26 +418,25 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 -#: ../IkiWiki.pm:1872 +#: ../IkiWiki/Plugin/git.pm:866 ../IkiWiki/Plugin/git.pm:929 ../IkiWiki.pm:1871 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:861 +#: ../IkiWiki/Plugin/git.pm:888 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:865 +#: ../IkiWiki/Plugin/git.pm:892 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:935 +#: ../IkiWiki/Plugin/git.pm:962 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:952 +#: ../IkiWiki/Plugin/git.pm:981 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -515,31 +514,31 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:216 +#: ../IkiWiki/Plugin/inline.pm:228 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:322 +#: ../IkiWiki/Plugin/inline.pm:334 #, perl-format msgid "%s (RSS feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:326 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "%s (Atom feed)" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:359 +#: ../IkiWiki/Plugin/inline.pm:371 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:400 ../IkiWiki/Plugin/template.pm:46 +#: ../IkiWiki/Plugin/inline.pm:412 ../IkiWiki/Plugin/template.pm:46 #, perl-format msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:739 +#: ../IkiWiki/Plugin/inline.pm:752 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -594,7 +593,7 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:450 +#: ../IkiWiki/Plugin/meta.pm:451 msgid "sort=meta requires a parameter" msgstr "" @@ -900,31 +899,31 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:39 ../IkiWiki/Plugin/rename.pm:37 +#: ../IkiWiki/Plugin/remove.pm:40 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:56 +#: ../IkiWiki/Plugin/remove.pm:57 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:59 ../IkiWiki/Plugin/rename.pm:46 +#: ../IkiWiki/Plugin/remove.pm:60 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:166 +#: ../IkiWiki/Plugin/remove.pm:167 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:203 +#: ../IkiWiki/Plugin/remove.pm:204 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:263 +#: ../IkiWiki/Plugin/remove.pm:264 msgid "removed" msgstr "" @@ -1176,52 +1175,52 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:335 ../IkiWiki/Render.pm:396 +#: ../IkiWiki/Render.pm:336 ../IkiWiki/Render.pm:397 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:352 ../IkiWiki/Render.pm:401 +#: ../IkiWiki/Render.pm:353 ../IkiWiki/Render.pm:402 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:438 +#: ../IkiWiki/Render.pm:439 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:517 +#: ../IkiWiki/Render.pm:518 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:602 +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:611 +#: ../IkiWiki/Render.pm:612 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:694 ../IkiWiki/Render.pm:776 +#: ../IkiWiki/Render.pm:695 ../IkiWiki/Render.pm:777 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:789 +#: ../IkiWiki/Render.pm:790 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:901 +#: ../IkiWiki/Render.pm:902 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:970 +#: ../IkiWiki/Render.pm:971 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1340,36 +1339,36 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1634 +#: ../IkiWiki.pm:1633 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1828 +#: ../IkiWiki.pm:1827 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:2141 +#: ../IkiWiki.pm:2140 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2399 +#: ../IkiWiki.pm:2398 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2484 +#: ../IkiWiki.pm:2483 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2505 +#: ../IkiWiki.pm:2504 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2654 +#: ../IkiWiki.pm:2653 #, perl-format msgid "cannot match pages: %s" msgstr ""