diff options
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | ikiwiki.spec | 2 | ||||
-rw-r--r-- | po/ikiwiki.pot | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 1ae992b7a..fd271dab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20101113) UNRELEASED; urgency=low +ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file. * more: Add pages parameter to limit where the more is displayed. @@ -19,7 +19,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low files like recentchanges files that are not normally checked in, when fixing links after rename. - -- Joey Hess <joeyh@debian.org> Tue, 16 Nov 2010 14:23:47 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 29 Nov 2010 13:59:10 -0400 ikiwiki (3.20101112) unstable; urgency=HIGH diff --git a/ikiwiki.spec b/ikiwiki.spec index 5ef43903d..b0826d64e 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101112 +Version: 3.20101129 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index e4274d0f6..492222b86 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: 2010-11-12 00:37-0400\n" +"POT-Creation-Date: 2010-11-29 14:01-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" @@ -129,7 +129,7 @@ msgstr "" msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "" @@ -359,26 +359,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki/Plugin/git.pm:766 ../IkiWiki/Plugin/git.pm:829 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:788 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:790 +#: ../IkiWiki/Plugin/git.pm:792 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:861 +#: ../IkiWiki/Plugin/git.pm:863 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:877 +#: ../IkiWiki/Plugin/git.pm:879 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:140 +#: ../IkiWiki/Plugin/highlight.pm:155 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -465,7 +465,7 @@ msgstr "" msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:630 +#: ../IkiWiki/Plugin/inline.pm:663 msgid "RPC::XML::Client not found, not pinging" msgstr "" |