releasing version 3.20110905

diff --git a/debian/changelog b/debian/changelog
index 0e82db1ba062122d65e966d461f7b688a0ab4be9..34f0ac8eedf4e9cbcce91a4bd59a2ed34456cfb6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20110716) UNRELEASED; urgency=low
+ikiwiki (3.20110905) unstable; urgency=low
 
   * mercurial: Openid nicknames are now used when committing. (Daniel Andersson)
   * mercurial: Implement rcs_commit_staged so comments, attachments, etc
@@ -13,7 +13,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
     regexp blowup.
   * Fix escaping of html entities in permalinks.
   * Fix escaping of html entities in tag names.
-  * Avoid using named capture groups in heredoc code for oldperl compatability.
+  * Avoid using named capture groups in heredoc code for oldperl compatibility.
   * Put in a workaround for #622591, by ensuring Search::Xapian gets loaded
     before Image::Magick.
   * Add unminified jquery js and css files to source.
@@ -31,7 +31,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
     Closes: #637603
   * Fix web revert of a file deletion.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Sep 2011 14:53:00 -0400
 
 ikiwiki (3.20110715) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 97d060505f803b12b4b14723f8fb472ea34680dd..03b3ea8b386afc4a60a175d7e7cf71be9812a621 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,6 @@ Description: a wiki compiler
  resolution, and page locking.
  .
  Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
- ikiwiki provides a plugin system which allows many other features to be
+ Ikiwiki provides a plugin system which allows many other features to be
  added. Some of the plugins have additional dependencies, found among the
  Recommends and Suggests of this package.

diff --git a/ikiwiki.spec b/ikiwiki.spec
index 70342b8a29b81e710a0950a8243cece31b96480e..8bd594417d4089588fa9198a0fba25e071c87842 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
-Version: 3.20110716
+Version: 3.20110905
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 4f2a458e65297cf4a00bb89765f539e3f200e472..1a2ad101718a006a1c3ed81437100d35bd294313 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"
-"POT-Creation-Date: 2011-07-15 18:48-0400\n"
+"POT-Creation-Date: 2011-09-05 14:55-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"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453
+#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1454
 msgid "Error"
 msgstr ""
 
@@ -137,7 +137,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227
 msgid "done"
 msgstr ""
 
@@ -370,31 +370,31 @@ msgstr ""
 msgid "%s is an attachment, not a page."
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839
-#: ../IkiWiki.pm:1671
+#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840
+#: ../IkiWiki.pm:1674
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:798
+#: ../IkiWiki/Plugin/git.pm:799
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:802
+#: ../IkiWiki/Plugin/git.pm:803
 msgid "you are not allowed to change file modes"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:872
+#: ../IkiWiki/Plugin/git.pm:873
 msgid "you are not allowed to revert a merge"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:891
+#: ../IkiWiki/Plugin/git.pm:892
 #, perl-format
 msgid "Failed to revert commit %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39
+#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41
 #, perl-format
 msgid "Must specify %s when using the %s plugin"
 msgstr ""
@@ -407,17 +407,17 @@ msgstr ""
 msgid "prog not a valid graphviz program"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:88
+#: ../IkiWiki/Plugin/highlight.pm:83
 #, perl-format
 msgid "tohighlight contains unknown file type '%s'"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:99
+#: ../IkiWiki/Plugin/highlight.pm:94
 #, perl-format
 msgid "Source code: %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/highlight.pm:184
+#: ../IkiWiki/Plugin/highlight.pm:179
 msgid ""
 "warning: highlight perl module not available; falling back to pass through"
 msgstr ""
@@ -529,7 +529,7 @@ msgstr ""
 msgid "redir cycle is not allowed"
 msgstr ""
 
-#: ../IkiWiki/Plugin/meta.pm:425
+#: ../IkiWiki/Plugin/meta.pm:427
 msgid "sort=meta requires a parameter"
 msgstr ""
 
@@ -641,70 +641,70 @@ msgid ""
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:461
+#: ../IkiWiki/Plugin/po.pm:468
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:484
+#: ../IkiWiki/Plugin/po.pm:491
 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:504
+#: ../IkiWiki/Plugin/po.pm:511
 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:950
+#: ../IkiWiki/Plugin/po.pm:957
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:964
+#: ../IkiWiki/Plugin/po.pm:971
 #, perl-format
 msgid "failed to copy underlay PO file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:973
+#: ../IkiWiki/Plugin/po.pm:980
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:979
+#: ../IkiWiki/Plugin/po.pm:986
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1015
+#: ../IkiWiki/Plugin/po.pm:1022
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1026
+#: ../IkiWiki/Plugin/po.pm:1033
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1105
+#: ../IkiWiki/Plugin/po.pm:1112
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174
-#: ../IkiWiki/Plugin/po.pm:1213
+#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181
+#: ../IkiWiki/Plugin/po.pm:1220
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1172
+#: ../IkiWiki/Plugin/po.pm:1179
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1225
+#: ../IkiWiki/Plugin/po.pm:1232
 msgid "invalid gettext data, go back to previous page to continue edit"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1268
+#: ../IkiWiki/Plugin/po.pm:1275
 #, perl-format
 msgid "%s has invalid syntax: must use CODE|NAME"
 msgstr ""
@@ -909,12 +909,12 @@ msgstr ""
 msgid "rsync_command exited %d"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:196
+#: ../IkiWiki/Plugin/search.pm:199
 #, perl-format
 msgid "need Digest::SHA to index %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/search.pm:250
+#: ../IkiWiki/Plugin/search.pm:253
 msgid "search"
 msgstr ""
 
@@ -1217,11 +1217,11 @@ msgstr ""
 msgid "usage: --set-yaml var=value"
 msgstr ""
 
-#: ../ikiwiki.in:215
+#: ../ikiwiki.in:216
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:218
+#: ../ikiwiki.in:219
 msgid "refreshing wiki.."
 msgstr ""
 
@@ -1242,36 +1242,36 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1435
+#: ../IkiWiki.pm:1436
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1627
+#: ../IkiWiki.pm:1630
 #, perl-format
 msgid "bad file name %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1927
+#: ../IkiWiki.pm:1930
 #, perl-format
 msgid "template %s not found"
 msgstr ""
 
-#: ../IkiWiki.pm:2177
+#: ../IkiWiki.pm:2180
 msgid "yes"
 msgstr ""
 
-#: ../IkiWiki.pm:2254
+#: ../IkiWiki.pm:2257
 #, perl-format
 msgid "invalid sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2275
+#: ../IkiWiki.pm:2278
 #, perl-format
 msgid "unknown sort type %s"
 msgstr ""
 
-#: ../IkiWiki.pm:2411
+#: ../IkiWiki.pm:2414
 #, perl-format
 msgid "cannot match pages: %s"
 msgstr ""