aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-25 11:08:57 -0400
committerJoey Hess <joey@kitenet.net>2012-08-25 11:08:57 -0400
commit80fa5c82a54084b37fdc96fa64978b0a970b5c30 (patch)
tree24541e0c7641a1fa7cdac9a037d048139f459c59
parentbbf1c14769dd160cd1d534737f18eece1f07d634 (diff)
downloadikiwiki-80fa5c82a54084b37fdc96fa64978b0a970b5c30.tar
ikiwiki-80fa5c82a54084b37fdc96fa64978b0a970b5c30.tar.gz
releasing version 3.20120725
-rw-r--r--debian/changelog4
-rw-r--r--ikiwiki.spec2
-rw-r--r--po/ikiwiki.pot22
3 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 8c1c685be..c2c58861a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (3.20120630) UNRELEASED; urgency=low
+ikiwiki (3.20120725) unstable; urgency=low
* recentchangesdiff: When diffurl is not set, provide inline diffs
in the recentchanges page, with visibility toggleable via javascript.
@@ -12,7 +12,7 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
Thanks, Antoine Beaupré
* comments: Remove ipv6 address specific code.
- -- Joey Hess <joeyh@debian.org> Thu, 19 Jul 2012 13:46:52 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 25 Aug 2012 10:58:42 -0400
ikiwiki (3.20120629) unstable; urgency=low
diff --git a/ikiwiki.spec b/ikiwiki.spec
index 596b465f8..1ad95f9c6 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
Name: ikiwiki
-Version: 3.20120629
+Version: 3.20120725
Release: 1%{?dist}
Summary: A wiki compiler
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 9f22d2146..393a72d5c 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: 2012-06-29 10:17-0400\n"
+"POT-Creation-Date: 2012-08-25 11: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"
@@ -253,37 +253,37 @@ msgstr ""
msgid "comments on page '%s' are closed"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:551
+#: ../IkiWiki/Plugin/comments.pm:548
msgid "comment stored for moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:553
+#: ../IkiWiki/Plugin/comments.pm:550
msgid "Your comment will be posted after moderator review"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:566
+#: ../IkiWiki/Plugin/comments.pm:563
msgid "Added a comment"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:570
+#: ../IkiWiki/Plugin/comments.pm:567
#, perl-format
msgid "Added a comment: %s"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:640 ../IkiWiki/Plugin/userlist.pm:55
+#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55
#: ../IkiWiki/Plugin/websetup.pm:272
msgid "you are not logged in as an admin"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:694
+#: ../IkiWiki/Plugin/comments.pm:691
msgid "Comment moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:735
+#: ../IkiWiki/Plugin/comments.pm:732
msgid "comment moderation"
msgstr ""
-#: ../IkiWiki/Plugin/comments.pm:896
+#: ../IkiWiki/Plugin/comments.pm:893
#, perl-format
msgid "%i comment"
msgid_plural "%i comments"
@@ -293,7 +293,7 @@ msgstr[1] ""
#. translators: Here "Comment" is a verb;
#. translators: the user clicks on it to
#. translators: post a comment.
-#: ../IkiWiki/Plugin/comments.pm:906
+#: ../IkiWiki/Plugin/comments.pm:903
msgid "Comment"
msgstr ""
@@ -844,7 +844,7 @@ msgstr ""
msgid "confirm reversion of %s"
msgstr ""
-#: ../IkiWiki/Plugin/recentchangesdiff.pm:47
+#: ../IkiWiki/Plugin/recentchangesdiff.pm:49
msgid "(Diff truncated)"
msgstr ""