releasing version 3.20110105

diff --git a/debian/changelog b/debian/changelog
index 4cf0a2965f8d04be2362ba4daf017be07e103793..02f3109e464e991d3963dcaeae0915284103c691 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20101232) UNRELEASED; urgency=low
+ikiwiki (3.20110105) unstable; urgency=low

 
   * tag: Do not include tagbase in rss/atom category tags. (Giuseppe Bilotta)
   * tag: Improve display of tags with a slash in their names.
 
   * tag: Do not include tagbase in rss/atom category tags. (Giuseppe Bilotta)
   * tag: Improve display of tags with a slash in their names.


@@ -14,7 +14,7 @@ ikiwiki (3.20101232) UNRELEASED; urgency=low
   * Removed `IkiWiki::misctemplate()` function. Any plugins using
     it should use `IkiWiki::cgitemplate()` instead.
 
   * Removed `IkiWiki::misctemplate()` function. Any plugins using
     it should use `IkiWiki::cgitemplate()` instead.
 

- -- Joey Hess <joeyh@debian.org>  Tue, 04 Jan 2011 16:00:55 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 Jan 2011 17:33:05 -0400

 
 ikiwiki (3.20101231) unstable; urgency=low
 
 
 ikiwiki (3.20101231) unstable; urgency=low
 

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 4567206910f9f208eec7f734b6bfa68106ab05f2..7daeb068f05c128c31bec1b504e529707ee66931 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
 Name:           ikiwiki

-Version: 3.20101231
+Version: 3.20110105

 Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index a2bac1d0e3b00a91d3b548fabee8b08166430415..418e7321d9e094b424d72886976e361631b21667 100644 (file)
--- 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-12-31 21:26-0400\n"
+"POT-Creation-Date: 2011-01-05 18:09-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"
 "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,118 +18,118 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 

-#: ../IkiWiki/CGI.pm:162
+#: ../IkiWiki/CGI.pm:200

 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 
 msgid ""
 "probable misconfiguration: sslcookie is set, but you are attempting to login "
 "via http, not https"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:165
+#: ../IkiWiki/CGI.pm:203

 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335
+#: ../IkiWiki/CGI.pm:222 ../IkiWiki/CGI.pm:373

 msgid "Your login session has expired."
 msgstr ""
 
 msgid "Your login session has expired."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:205
+#: ../IkiWiki/CGI.pm:243

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:206
+#: ../IkiWiki/CGI.pm:244

 msgid "Preferences"
 msgstr ""
 
 msgid "Preferences"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:207
+#: ../IkiWiki/CGI.pm:245

 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:247
+#: ../IkiWiki/CGI.pm:285

 msgid "Preferences saved."
 msgstr ""
 
 msgid "Preferences saved."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:299
+#: ../IkiWiki/CGI.pm:337

 msgid "You are banned."
 msgstr ""
 
 msgid "You are banned."
 msgstr ""
 

-#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1414
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1424

 msgid "Error"
 msgstr ""
 
 msgid "Error"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:84
+#: ../IkiWiki/Plugin/aggregate.pm:83

 msgid "Aggregation triggered via web."
 msgstr ""
 
 msgid "Aggregation triggered via web."
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:93
+#: ../IkiWiki/Plugin/aggregate.pm:92

 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 
 msgid "Nothing to do right now, all feeds are up-to-date!"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:222
+#: ../IkiWiki/Plugin/aggregate.pm:221

 #, perl-format
 msgid "missing %s parameter"
 msgstr ""
 
 #, perl-format
 msgid "missing %s parameter"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:257
+#: ../IkiWiki/Plugin/aggregate.pm:256

 msgid "new feed"
 msgstr ""
 
 msgid "new feed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:271
+#: ../IkiWiki/Plugin/aggregate.pm:270

 msgid "posts"
 msgstr ""
 
 msgid "posts"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:273
+#: ../IkiWiki/Plugin/aggregate.pm:272

 msgid "new"
 msgstr ""
 
 msgid "new"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:457
+#: ../IkiWiki/Plugin/aggregate.pm:456

 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 
 #, perl-format
 msgid "expiring %s (%s days old)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:464
+#: ../IkiWiki/Plugin/aggregate.pm:463

 #, perl-format
 msgid "expiring %s"
 msgstr ""
 
 #, perl-format
 msgid "expiring %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:491
+#: ../IkiWiki/Plugin/aggregate.pm:490

 #, perl-format
 msgid "last checked %s"
 msgstr ""
 
 #, perl-format
 msgid "last checked %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:495
+#: ../IkiWiki/Plugin/aggregate.pm:494

 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 
 #, perl-format
 msgid "checking feed %s ..."
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:500
+#: ../IkiWiki/Plugin/aggregate.pm:499

 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 
 #, perl-format
 msgid "could not find feed at %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:519
+#: ../IkiWiki/Plugin/aggregate.pm:518

 msgid "feed not found"
 msgstr ""
 
 msgid "feed not found"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:530
+#: ../IkiWiki/Plugin/aggregate.pm:529

 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 
 #, perl-format
 msgid "(invalid UTF-8 stripped from feed)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:538
+#: ../IkiWiki/Plugin/aggregate.pm:537

 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 
 #, perl-format
 msgid "(feed entities escaped)"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:546
+#: ../IkiWiki/Plugin/aggregate.pm:545

 msgid "feed crashed XML::Feed!"
 msgstr ""
 
 msgid "feed crashed XML::Feed!"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:632
+#: ../IkiWiki/Plugin/aggregate.pm:631

 #, perl-format
 msgid "creating new page %s"
 msgstr ""
 
 #, perl-format
 msgid "creating new page %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:135
+#: ../IkiWiki/Plugin/aggregate.pm:651 ../IkiWiki/Plugin/edittemplate.pm:135

 msgid "failed to process template:"
 msgstr ""
 
 msgid "failed to process template:"
 msgstr ""
 


@@ -224,51 +224,51 @@ msgstr ""
 msgid "bad page name"
 msgstr ""
 
 msgid "bad page name"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:377
+#: ../IkiWiki/Plugin/comments.pm:375

 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 
 #, perl-format
 msgid "commenting on %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:394
+#: ../IkiWiki/Plugin/comments.pm:392

 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 
 #, perl-format
 msgid "page '%s' doesn't exist, so you can't comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:401
+#: ../IkiWiki/Plugin/comments.pm:399

 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 
 #, perl-format
 msgid "comments on page '%s' are closed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:509
+#: ../IkiWiki/Plugin/comments.pm:507

 msgid "comment stored for moderation"
 msgstr ""
 
 msgid "comment stored for moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:511
+#: ../IkiWiki/Plugin/comments.pm:509

 msgid "Your comment will be posted after moderator review"
 msgstr ""
 
 msgid "Your comment will be posted after moderator review"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:524
+#: ../IkiWiki/Plugin/comments.pm:522

 msgid "Added a comment"
 msgstr ""
 
 msgid "Added a comment"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:528
+#: ../IkiWiki/Plugin/comments.pm:526

 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 
 #, perl-format
 msgid "Added a comment: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:572 ../IkiWiki/Plugin/websetup.pm:269
+#: ../IkiWiki/Plugin/comments.pm:570 ../IkiWiki/Plugin/websetup.pm:269

 msgid "you are not logged in as an admin"
 msgstr ""
 
 msgid "you are not logged in as an admin"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:624
+#: ../IkiWiki/Plugin/comments.pm:622

 msgid "Comment moderation"
 msgstr ""
 
 msgid "Comment moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:665
+#: ../IkiWiki/Plugin/comments.pm:663

 msgid "comment moderation"
 msgstr ""
 
 msgid "comment moderation"
 msgstr ""
 

-#: ../IkiWiki/Plugin/comments.pm:828
+#: ../IkiWiki/Plugin/comments.pm:826

 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"
 #, perl-format
 msgid "%i comment"
 msgid_plural "%i comments"


@@ -278,7 +278,7 @@ msgstr[1] ""
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.
 #. translators: Here "Comment" is a verb;
 #. translators: the user clicks on it to
 #. translators: post a comment.

-#: ../IkiWiki/Plugin/comments.pm:838
+#: ../IkiWiki/Plugin/comments.pm:836

 msgid "Comment"
 msgstr ""
 
 msgid "Comment"
 msgstr ""
 


@@ -313,9 +313,9 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
 msgid "creating %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332
-#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388
-#: ../IkiWiki/Plugin/editpage.pm:430
+#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331
+#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:387
+#: ../IkiWiki/Plugin/editpage.pm:429

 #, perl-format
 msgid "editing %s"
 msgstr ""
 #, perl-format
 msgid "editing %s"
 msgstr ""


@@ -360,7 +360,7 @@ msgid "%s is an attachment, not a page."
 msgstr ""
 
 #: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
 msgstr ""
 
 #: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839

-#: ../IkiWiki.pm:1624
+#: ../IkiWiki.pm:1634

 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""


@@ -504,7 +504,7 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
 msgid "redir cycle is not allowed"
 msgstr ""
 

-#: ../IkiWiki/Plugin/meta.pm:400
+#: ../IkiWiki/Plugin/meta.pm:405

 msgid "sort=meta requires a parameter"
 msgstr ""
 
 msgid "sort=meta requires a parameter"
 msgstr ""
 


@@ -889,7 +889,7 @@ msgstr ""
 msgid "need Digest::SHA to index %s"
 msgstr ""
 
 msgid "need Digest::SHA to index %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/search.pm:232
+#: ../IkiWiki/Plugin/search.pm:233

 msgid "search"
 msgstr ""
 
 msgid "search"
 msgstr ""
 


@@ -972,7 +972,7 @@ msgstr ""
 msgid "parse fail at line %d: %s"
 msgstr ""
 
 msgid "parse fail at line %d: %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/tag.pm:83
+#: ../IkiWiki/Plugin/tag.pm:94

 #, perl-format
 msgid "creating tag page %s"
 msgstr ""
 #, perl-format
 msgid "creating tag page %s"
 msgstr ""


@@ -1148,13 +1148,13 @@ msgid "wrapper filename not specified"
 msgstr ""
 
 #. translators: The parameter is a C filename.
 msgstr ""
 
 #. translators: The parameter is a C filename.

-#: ../IkiWiki/Wrapper.pm:219
+#: ../IkiWiki/Wrapper.pm:220

 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.

-#: ../IkiWiki/Wrapper.pm:239
+#: ../IkiWiki/Wrapper.pm:240

 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""


@@ -1200,36 +1200,36 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 

-#: ../IkiWiki.pm:1396
+#: ../IkiWiki.pm:1406

 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 

-#: ../IkiWiki.pm:1580
+#: ../IkiWiki.pm:1590

 #, perl-format
 msgid "bad file name %s"
 msgstr ""
 
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
 

-#: ../IkiWiki.pm:1880
+#: ../IkiWiki.pm:1890

 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 

-#: ../IkiWiki.pm:2163
+#: ../IkiWiki.pm:2140

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

-#: ../IkiWiki.pm:2240
+#: ../IkiWiki.pm:2217

 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 

-#: ../IkiWiki.pm:2261
+#: ../IkiWiki.pm:2238

 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 

-#: ../IkiWiki.pm:2397
+#: ../IkiWiki.pm:2374

 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""