From 84224c78a031743f40b4f5e3394eefb1d5f9d129 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 31 Dec 2010 21:34:52 -0400 Subject: [PATCH] releasing version 3.20101231 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 90 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 430a14eb7..504636710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20101202) UNRELEASED; urgency=low +ikiwiki (3.20101231) unstable; urgency=low * Better support for serving the same site on multiple urls. (Such as a http and a https url, or a ipv4 and an ipv6 url.) @@ -30,7 +30,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low * git: Fix bug involving attempting to web revert a commit that included changes to attachments. - -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 + -- Joey Hess Fri, 31 Dec 2010 21:23:37 -0400 ikiwiki (3.20101201) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 09cc4a0f4..456720691 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101201 +Version: 3.20101231 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 6eb13103e..a2bac1d0e 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-12-01 20:29-0400\n" +"POT-Creation-Date: 2010-12-31 21:26-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,7 +52,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1414 msgid "Error" msgstr "" @@ -229,38 +229,38 @@ msgstr "" msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:395 +#: ../IkiWiki/Plugin/comments.pm:394 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:402 +#: ../IkiWiki/Plugin/comments.pm:401 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:509 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:512 +#: ../IkiWiki/Plugin/comments.pm:511 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 +#: ../IkiWiki/Plugin/comments.pm:524 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:529 +#: ../IkiWiki/Plugin/comments.pm:528 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 +#: ../IkiWiki/Plugin/comments.pm:572 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:625 +#: ../IkiWiki/Plugin/comments.pm:624 msgid "Comment moderation" msgstr "" @@ -359,26 +359,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:766 ../IkiWiki/Plugin/git.pm:829 -#: ../IkiWiki.pm:1580 +#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 +#: ../IkiWiki.pm:1624 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:788 +#: ../IkiWiki/Plugin/git.pm:798 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:792 +#: ../IkiWiki/Plugin/git.pm:802 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:863 +#: ../IkiWiki/Plugin/git.pm:872 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:891 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -396,17 +396,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:64 +#: ../IkiWiki/Plugin/highlight.pm:88 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:75 +#: ../IkiWiki/Plugin/highlight.pm:99 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:155 +#: ../IkiWiki/Plugin/highlight.pm:184 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -616,70 +616,70 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:455 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:478 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:498 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:941 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:955 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:958 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:970 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1006 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1011 +#: ../IkiWiki/Plugin/po.pm:1017 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1090 +#: ../IkiWiki/Plugin/po.pm:1096 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 -#: ../IkiWiki/Plugin/po.pm:1198 +#: ../IkiWiki/Plugin/po.pm:1153 ../IkiWiki/Plugin/po.pm:1165 +#: ../IkiWiki/Plugin/po.pm:1204 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1157 +#: ../IkiWiki/Plugin/po.pm:1163 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1210 +#: ../IkiWiki/Plugin/po.pm:1216 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1252 +#: ../IkiWiki/Plugin/po.pm:1258 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -791,7 +791,7 @@ msgstr "" msgid "confirm reversion of %s" msgstr "" -#: ../IkiWiki/Plugin/recentchangesdiff.pm:37 +#: ../IkiWiki/Plugin/recentchangesdiff.pm:36 msgid "(Diff truncated)" msgstr "" @@ -1187,49 +1187,49 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:538 +#: ../IkiWiki.pm:544 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:584 +#: ../IkiWiki.pm:616 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:614 +#: ../IkiWiki.pm:646 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1352 +#: ../IkiWiki.pm:1396 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1536 +#: ../IkiWiki.pm:1580 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1836 +#: ../IkiWiki.pm:1880 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2118 +#: ../IkiWiki.pm:2163 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2195 +#: ../IkiWiki.pm:2240 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2216 +#: ../IkiWiki.pm:2261 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2352 +#: ../IkiWiki.pm:2397 #, perl-format msgid "cannot match pages: %s" msgstr "" -- 2.11.4.GIT