From 412f9ea2bb4d8568e6c82ba28e8155ccb296221a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 10 Jun 2015 21:59:11 +0100 Subject: [PATCH] 3.20150610 --- debian/NEWS | 4 +-- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 84 ++++++++++++++++++++++++------------------------ 4 files changed, 47 insertions(+), 47 deletions(-) diff --git a/debian/NEWS b/debian/NEWS index c1f343520..b2753c638 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.20150330) UNRELEASED; urgency=medium +ikiwiki (3.20150610) unstable; urgency=low The new "emailauth" plugin allows users to authenticate using an email address, without otherwise creating an account. @@ -8,7 +8,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium Conversely, if emailauth is required on a wiki that does not enable openid, you can list it in the enable_plugins setting. - -- Simon McVittie Wed, 27 May 2015 08:30:43 +0100 + -- Simon McVittie Wed, 10 Jun 2015 21:56:56 +0100 ikiwiki (3.20150107) experimental; urgency=medium diff --git a/debian/changelog b/debian/changelog index f7219d0f5..5744a09b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20150330) UNRELEASED; urgency=medium +ikiwiki (3.20150610) unstable; urgency=low [ Joey Hess ] * New emailauth plugin lets users log in, without any registration, @@ -37,7 +37,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium * haiku: if deterministic build is requested, return a hard-coded haiku * polygen: if deterministic build is requested, use a well-known random seed - -- Joey Hess Tue, 28 Apr 2015 12:24:08 -0400 + -- Simon McVittie Wed, 10 Jun 2015 21:56:36 +0100 ikiwiki (3.20150329) experimental; urgency=high diff --git a/ikiwiki.spec b/ikiwiki.spec index a02ca5da7..001252b4d 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20150330 +Version: 3.20150610 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 7ad8bc3d9..864383342 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-05-14 10:41-0400\n" +"POT-Creation-Date: 2015-06-09 22:32+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,7 +28,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:244 ../IkiWiki/CGI.pm:396 +#: ../IkiWiki/CGI.pm:244 ../IkiWiki/CGI.pm:399 msgid "Your login session has expired." msgstr "" @@ -48,11 +48,11 @@ msgstr "" msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:359 +#: ../IkiWiki/CGI.pm:362 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:487 ../IkiWiki/CGI.pm:488 ../IkiWiki.pm:1624 +#: ../IkiWiki/CGI.pm:490 ../IkiWiki/CGI.pm:491 ../IkiWiki.pm:1652 msgid "Error" msgstr "" @@ -167,19 +167,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:225 +#: ../IkiWiki/Plugin/attachment.pm:234 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:298 +#: ../IkiWiki/Plugin/attachment.pm:307 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:349 +#: ../IkiWiki/Plugin/attachment.pm:358 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:367 +#: ../IkiWiki/Plugin/attachment.pm:376 msgid "just uploaded" msgstr "" @@ -376,17 +376,17 @@ msgstr "" msgid "Invalid email address." msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:88 ../IkiWiki/Plugin/passwordauth.pm:371 +#: ../IkiWiki/Plugin/emailauth.pm:90 ../IkiWiki/Plugin/passwordauth.pm:377 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:90 +#: ../IkiWiki/Plugin/emailauth.pm:92 msgid "" "You have been sent an email, with a link you can open to complete the login " "process." msgstr "" -#: ../IkiWiki/Plugin/emailauth.pm:107 +#: ../IkiWiki/Plugin/emailauth.pm:109 msgid "" "Wrong login token length. Please check that you pasted in the complete login " "link from the email!" @@ -419,7 +419,7 @@ msgid "%s is an attachment, not a page." msgstr "" #: ../IkiWiki/Plugin/git.pm:839 ../IkiWiki/Plugin/git.pm:902 -#: ../IkiWiki.pm:1844 +#: ../IkiWiki.pm:1872 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -634,43 +634,43 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:337 +#: ../IkiWiki/Plugin/passwordauth.pm:145 ../IkiWiki/Plugin/passwordauth.pm:343 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:297 +#: ../IkiWiki/Plugin/passwordauth.pm:303 msgid "Your user page: " msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:304 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "Create your user page" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:334 +#: ../IkiWiki/Plugin/passwordauth.pm:340 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:344 +#: ../IkiWiki/Plugin/passwordauth.pm:350 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:373 +#: ../IkiWiki/Plugin/passwordauth.pm:379 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:408 +#: ../IkiWiki/Plugin/passwordauth.pm:414 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:411 +#: ../IkiWiki/Plugin/passwordauth.pm:417 msgid "password reset denied" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:424 +#: ../IkiWiki/Plugin/passwordauth.pm:430 msgid "incorrect url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:427 +#: ../IkiWiki/Plugin/passwordauth.pm:433 msgid "access denied" msgstr "" @@ -797,11 +797,11 @@ msgstr "" msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:42 +#: ../IkiWiki/Plugin/polygen.pm:43 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:61 +#: ../IkiWiki/Plugin/polygen.pm:62 msgid "command failed" msgstr "" @@ -1191,37 +1191,37 @@ msgstr "" msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:513 +#: ../IkiWiki/Render.pm:517 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:598 +#: ../IkiWiki/Render.pm:602 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:607 +#: ../IkiWiki/Render.pm:611 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:690 ../IkiWiki/Render.pm:772 +#: ../IkiWiki/Render.pm:694 ../IkiWiki/Render.pm:776 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:785 +#: ../IkiWiki/Render.pm:789 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:896 +#: ../IkiWiki/Render.pm:901 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:965 +#: ../IkiWiki/Render.pm:970 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1322,54 +1322,54 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:648 +#: ../IkiWiki.pm:656 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:723 +#: ../IkiWiki.pm:731 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:763 +#: ../IkiWiki.pm:771 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:793 +#: ../IkiWiki.pm:801 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1606 +#: ../IkiWiki.pm:1634 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1800 +#: ../IkiWiki.pm:1828 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:2113 +#: ../IkiWiki.pm:2141 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2371 +#: ../IkiWiki.pm:2399 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2456 +#: ../IkiWiki.pm:2484 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2477 +#: ../IkiWiki.pm:2505 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2626 +#: ../IkiWiki.pm:2654 #, perl-format msgid "cannot match pages: %s" msgstr "" -- 2.39.5