From: Joey Hess Date: Mon, 21 Mar 2011 19:01:19 +0000 (-0400) Subject: releasing version 3.20110321 X-Git-Tag: 3.20110321^0 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5c2ba98bccde8bbaa5fb054f859eae843e756a05?hp=37bbec8c3c4ba35a8b955d105426801c4653e4a7 releasing version 3.20110321 --- diff --git a/debian/NEWS b/debian/NEWS index d0d74a167..ff856e5f0 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.20110114) unstable; urgency=low +ikiwiki (3.20110122) unstable; urgency=low If you have custom CSS that uses "#feedlinks" or "#blogform", you will need to change it to instead use ".feedlinks" and ".blogform" diff --git a/debian/changelog b/debian/changelog index 15328d694..b8a6c8c88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20110226) UNRELEASED; urgency=low +ikiwiki (3.20110321) unstable; urgency=low * comment: Don't show comments of subpages on parent pages. (Fixes bug introduced in version 3.20100505.) @@ -10,7 +10,7 @@ ikiwiki (3.20110226) UNRELEASED; urgency=low * Avoid escaping / characters in filenames when building the cgiurl, as this confuses eg, cvsweb. - -- Joey Hess Sun, 27 Feb 2011 18:14:05 -0400 + -- Joey Hess Mon, 21 Mar 2011 14:45:05 -0400 ikiwiki (3.20110225) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 8c43e8b4e..efc061272 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20110225 +Version: 3.20110321 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index b170a05e3..8e4ee6435 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: 2011-02-25 17:34-0400\n" +"POT-Creation-Date: 2011-03-21 14:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,80 +56,80 @@ msgstr "" msgid "Error" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:83 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:92 +#: ../IkiWiki/Plugin/aggregate.pm:104 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:225 +#: ../IkiWiki/Plugin/aggregate.pm:237 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:260 +#: ../IkiWiki/Plugin/aggregate.pm:272 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:286 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:276 +#: ../IkiWiki/Plugin/aggregate.pm:288 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:463 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:470 +#: ../IkiWiki/Plugin/aggregate.pm:482 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:501 +#: ../IkiWiki/Plugin/aggregate.pm:513 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:506 +#: ../IkiWiki/Plugin/aggregate.pm:518 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:525 +#: ../IkiWiki/Plugin/aggregate.pm:541 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:552 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:560 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:568 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:641 +#: ../IkiWiki/Plugin/aggregate.pm:657 #, perl-format msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:661 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr ""