From: Joey Hess Date: Thu, 16 Jul 2009 18:46:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/7db41e1aa97f5f30a9bb523c939cce192cc104c7?hp=295a9e11cd58f92b105107398e9b78081ed55253 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/debian/changelog b/debian/changelog index d57158c1a..05b7be70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ikiwiki (3.1416) UNRELEASED; urgency=low +ikiwiki (3.14159) unstable; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. * img: Pass the align parameter through to the generated img tag. * Move OpenID pretty-printing from openid plugin to core (smcv) - -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + -- Joey Hess Thu, 16 Jul 2009 14:37:22 -0400 ikiwiki (3.1415) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 74ffd1c74..c914fd69d 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: 2009-07-07 16:32-0400\n" +"POT-Creation-Date: 2009-07-16 14:38-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1218 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 msgid "Error" msgstr "" @@ -1038,16 +1038,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1201 +#: ../IkiWiki.pm:1236 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1741 +#: ../IkiWiki.pm:1776 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1873 +#: ../IkiWiki.pm:1908 #, perl-format msgid "cannot match pages: %s" msgstr ""