releasing version 2.60

diff --git a/debian/NEWS b/debian/NEWS
index 7e76dd9e2217499b2dc5691a19c4b9c5f1832cde..e0c9b77eb64119ede76bff3e50a9637774d398bc 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -6,7 +6,7 @@ ikiwiki (2.60) unstable; urgency=low
   that's deprecated, and the prefs will be hidden if a value is not already
   set. If a value is set in the web interface, you're encouraged to move that
   setting to your setup file now, since version 3.0 will remove the deprecated
   that's deprecated, and the prefs will be hidden if a value is not already
   set. If a value is set in the web interface, you're encouraged to move that
   setting to your setup file now, since version 3.0 will remove the deprecated

-  web interface.
+  admin prefs web interface.

 
   Also, the layout of the setup file has changed in a significant way in this
   release. Old setup files will continue to work, but new features, like the
 
   Also, the layout of the setup file has changed in a significant way in this
   release. Old setup files will continue to work, but new features, like the

diff --git a/debian/changelog b/debian/changelog
index 7ed7ebe8feb10121df221dcae73ce94b9d23a92f..e6b122e5d39ef272ad5bba74d5332bca9beb917f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.60) UNRELEASED; urgency=low
+ikiwiki (2.60) unstable; urgency=low

  
   [ Joey Hess ]
   * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"
  
   [ Joey Hess ]
   * Starting with this version, "ikiwiki -setup /etc/ikiwiki/auto.setup"


@@ -39,7 +39,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * rename: Support changing page extensions. (willu)
   * Danish update. Closes: #494632
 
   * rename: Support changing page extensions. (willu)
   * Danish update. Closes: #494632
 

- -- Josh Triplett <josh@freedesktop.org>  Wed, 06 Aug 2008 20:56:06 -0700
+ -- Joey Hess <joeyh@debian.org>  Tue, 12 Aug 2008 14:20:25 -0400

 
 ikiwiki (2.56) unstable; urgency=low
 
 
 ikiwiki (2.56) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index a6328c48d3f3fb5599c328ed64c08bdc4f46052d..d842d4c4f02c3af68667036c1b50b436ba8bd54f 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"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-08-06 01:51-0400\n"
+"POT-Creation-Date: 2008-08-12 14:21-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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -577,20 +577,20 @@ msgstr ""
 msgid "rename %s"
 msgstr ""
 
 msgid "rename %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:188
+#: ../IkiWiki/Plugin/rename.pm:206

 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 
 msgid "Only one attachment can be renamed at a time."
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:191
+#: ../IkiWiki/Plugin/rename.pm:209

 msgid "Please select the attachment to rename."
 msgstr ""
 
 msgid "Please select the attachment to rename."
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:255
+#: ../IkiWiki/Plugin/rename.pm:277

 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 
 #, perl-format
 msgid "rename %s to %s"
 msgstr ""
 

-#: ../IkiWiki/Plugin/rename.pm:283
+#: ../IkiWiki/Plugin/rename.pm:306

 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr ""