From 5e52bfb2e743138fb365cb6a63c98d836883f287 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 15:25:45 -0400
Subject: inline: Only the last feed link was put on the page, fix this to
 include all feed links. So rss will be included along with atom, and pages
 with multiple feeds will get links added for all feeds.

---
 debian/changelog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index e53799306..42c8a52e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Use the pure perl Data::Dumper when generating setup files to ensure that
     utf-8 characters are written out as such, and not as the encoded perl
     strings the C Data::Dumper produces.
+  * inline: Only the last feed link was put on the page, fix this to include
+    all feed links. So rss will be included along with atom, and pages with
+    multiple feeds will get links added for all feeds.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
-- 
cgit v1.2.3


From a2839de9362187b67b0e3a564461e272e64fd9b4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 20 Oct 2008 18:17:03 -0400
Subject: tag: When tagpage is set, force the links created by tagging to point
 at the toplevel tagpage, and not closer subpages.

The html links already went there, but internally the links were not
recorded as absolute, which could cause confusing backlinks etc.

For example, with tagbase=tags, if blog/tags/bar existed and blog/foo was
tagged bar, it would link to /tags/bar. But, the link would be recorded
simply as a link to tags/bar, and so later blog/tags/bar would appear to
have the backlink.
---
 IkiWiki/Plugin/tag.pm | 2 +-
 debian/changelog      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 158657507..c4a175677 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -43,7 +43,7 @@ sub tagpage ($) { #{{{
 			
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
-		$tag=$config{tagbase}."/".$tag;
+		$tag="/".$config{tagbase}."/".$tag;
 	}
 
 	return $tag;
diff --git a/debian/changelog b/debian/changelog
index 42c8a52e9..928cd8666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * inline: Only the last feed link was put on the page, fix this to include
     all feed links. So rss will be included along with atom, and pages with
     multiple feeds will get links added for all feeds.
+  * tag: When tagpage is set, force the links created by tagging to point at
+    the toplevel tagpage, and not closer subpages. The html links already went
+    there, but internally the links were not recorded as absolute, which could
+    cause confusing backlinks etc.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
-- 
cgit v1.2.3


From e75818572fff5256d16221a2b065b214d8cb9f5d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 21 Oct 2008 17:57:19 -0400
Subject: function injection overhaul

Add an inject function, that can be used by plugins that want to replace
one of ikiwiki's functions with their own version. (This is a scary thing
that grubs through the symbol table, and replaces all exported occurances
of a function with the injected version.)

external: RPC functions can be injected to replace exported functions.

Removed the stupid displaytime hook, and use injection instead.
---
 IkiWiki.pm                     | 46 +++++++++++++++++++++++++-------------
 IkiWiki/Plugin/external.pm     |  8 ++++++-
 IkiWiki/Plugin/relativedate.pm |  4 ++--
 debian/changelog               |  5 +++++
 doc/plugins/contrib/po.mdwn    |  5 +++++
 doc/plugins/write.mdwn         | 50 ++++++++++++++++++++++++++++++++++++++++++
 plugins/externaldemo           | 10 ++++-----
 po/ikiwiki.pot                 | 14 ++++++------
 8 files changed, 111 insertions(+), 31 deletions(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 207ca87fb..e0454963d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -21,6 +21,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
+		 inject
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
@@ -898,23 +899,13 @@ sub abs2rel ($$) { #{{{
 } #}}}
 
 sub displaytime ($;$) { #{{{
-	my $time=shift;
-	my $format=shift;
-	if (exists $hooks{displaytime}) {
-		my $ret;
-		run_hooks(displaytime => sub {
-			$ret=shift->($time, $format)
-		});
-		return $ret;
-	}
-	else {
-		return formattime($time, $format);
-	}
+	# Plugins can override this function to mark up the time to
+	# display.
+	return '<span class="date">'.formattime(@_).'</span>';
 } #}}}
 
 sub formattime ($;$) { #{{{
-	# Plugins can override this function to mark up the time for
-	# display.
+	# Plugins can override this function to format the time.
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {
@@ -1676,6 +1667,31 @@ sub yesno ($) { #{{{
 	return (defined $val && lc($val) eq gettext("yes"));
 } #}}}
 
+sub inject { #{{{
+	# Injects a new function into the symbol table to replace an
+	# exported function.
+	my %params=@_;
+
+	# This is deep ugly perl foo, beware.
+	no strict;
+	no warnings;
+	if (! defined $params{parent}) {
+		$params{parent}='::';
+		$params{old}=\&{$params{name}};
+		$params{name}=~s/.*:://;
+	}
+	my $parent=$params{parent};
+	foreach my $ns (grep /^\w+::/, keys %{$parent}) {
+		$ns = $params{parent} . $ns;
+		inject(%params, parent => $ns) unless $ns eq '::main::';
+		*{$ns . $params{name}} = $params{call}
+			if exists ${$ns}{$params{name}} &&
+			   \&{${$ns}{$params{name}}} == $params{old};
+	}
+	use strict;
+	use warnings;
+} #}}}
+
 sub pagespec_merge ($$) { #{{{
 	my $a=shift;
 	my $b=shift;
@@ -1770,7 +1786,7 @@ sub pagespec_valid ($) { #{{{
 	my $sub=pagespec_translate($spec);
 	return ! $@;
 } #}}}
-	
+
 sub glob2re ($) { #{{{
 	my $re=quotemeta(shift);
 	$re=~s/\\\*/.*/g;
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 287e118f1..4ce9c8bab 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -202,10 +202,16 @@ sub inject ($@) { #{{{
 	my $sub = sub {
 		IkiWiki::Plugin::external::rpc_call($plugin, $params{call}, @_)
 	};
+	$sub=memoize($sub) if $params{memoize};
+
+	# This will add it to the symbol table even if not present.
 	no warnings;
 	eval qq{*$params{name}=\$sub};
 	use warnings;
-	memoize($params{name}) if $params{memoize};
+
+	# This will ensure that everywhere it was exported to sees
+	# the injected version.
+	IkiWiki::inject(name => $params{name}, call => $sub);
 	return 1;
 } #}}}
 
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index f4dba61a4..dc8f7d538 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -12,7 +12,7 @@ sub import { #{{{
 	add_underlay("javascript");
 	hook(type => "getsetup", id => "relativedate", call => \&getsetup);
 	hook(type => "format", id => "relativedate", call => \&format);
-	hook(type => "displaytime", id => "relativedate", call => \&display);
+	inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);
 } # }}}
 
 sub getsetup () { #{{{
@@ -43,7 +43,7 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
-sub display ($;$) { #{{{
+sub mydisplaytime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 
diff --git a/debian/changelog b/debian/changelog
index 928cd8666..e1baea8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,11 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     the toplevel tagpage, and not closer subpages. The html links already went
     there, but internally the links were not recorded as absolute, which could
     cause confusing backlinks etc.
+  * Add an inject function, that can be used by plugins that want to
+    replace one of ikiwiki's functions with their own version.
+    (This is a scary thing that grubs through the symbol table, and replaces
+    all exported occurances of a function with the injected version.)
+  * external: RPC functions can be injected to replace exported functions.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 30ede95a6..c4b7f9ee9 100644
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -47,6 +47,11 @@ Any thoughts on this?
 >>> `targetpage`, `bestlink`, and `beautify_urlpath`. But, I noticed
 >>> the other day that such wrappers around exported functions are only visible by
 >>> plugins loaded after the plugin that defines them.
+>>> 
+>>> Update: Take a look at the new "Function overriding" section of
+>>> [[plugins/write]]. I think you can just inject wrappers about a few ikiwiki
+>>> functions, rather than adding hooks. The `inject` function is pretty
+>>> insane^Wlow level, but seems to work great. --[[Joey]]
 >>
 >> The Discussion pages issue is something I am not sure about yet. But I will
 >> probably decide that "slave" pages, being only translations, don't deserve
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 856b34ba1..2e11e6234 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -854,6 +854,56 @@ By the way, to parse a ikiwiki setup file and populate `%config`, a
 program just needs to do something like:
 `use IkiWiki::Setup; IkiWiki::Setup::load($filename)`
 
+### Function overriding
+
+Sometimes using ikiwiki's pre-defined hooks is not enough. Your plugin
+may need to replace one of ikiwiki's own functions with a modified version,
+or wrap one of the functions.
+
+For example, your plugin might want to override `displaytime`, to change
+the html markup used when displaying a date. Or it might want to override
+`IkiWiki::formattime`, to change how a date is formatted. Or perhaps you
+want to override `bestlink` and change how ikiwiki deals with WikiLinks.
+
+By venturing into this territory, your plugin is becoming tightly tied to
+ikiwiki's internals. And it might break if those internals change. But
+don't let that stop you, if you're brave.
+
+Ikiwiki provides an `inject()` function, that is a powerful way to replace
+any function with one of your own. This even allows you to inject a
+replacement for an exported function, like `bestlink`. Everything that
+imports that function will get your version instead. Pass it the name of
+the function to replace, and a new function to call. 
+
+For example, here's how to replace `displaytime` with a version using HTML 5
+markup:
+
+	inject(name => 'IkiWiki::displaytime', call => sub {
+		return "<time>".formattime(@_)."</time>";
+	});
+
+Here's how to wrap `bestlink` with a version that tries to handle
+plural words:
+
+	my $origbestlink=\&bestlink;
+	inject(name => 'IkiWiki::bestlink', call => \&mybestlink);
+
+	sub deplural ($) {
+		my $word=shift;
+		$word =~ s/e?s$//; # just an example :-)
+		return $word;
+	}
+
+	sub mybestlink ($$) {
+		my $page=shift;
+		my $link=shift;
+		my $ret=$origbestlink->($page, $link);
+		if (! length $ret) {
+			$ret=$origbestlink->($page, deplural($link));
+		}
+		return $ret;
+	}
+
 ### Javascript
 
 Some plugins use javascript to make ikiwiki look a bit more web-2.0-ish.
diff --git a/plugins/externaldemo b/plugins/externaldemo
index 4d13f2444..be7aba8b9 100755
--- a/plugins/externaldemo
+++ b/plugins/externaldemo
@@ -106,9 +106,8 @@ sub import {
 		rpc_call("getvar", "config", "url")."\n";
 
 	# Here's an example of how to inject an arbitrary function into
-	# ikiwiki, replacing a core function.
-	# Note use of automatic memoization.
-	rpc_call("inject", name => "IkiWiki::formattime",
+	# ikiwiki. Note use of automatic memoization.
+	rpc_call("inject", name => "IkiWiki::bob",
 		call => "formattime", memoize => 1);
 
 	print STDERR "externaldemo plugin successfully imported\n";
@@ -126,9 +125,8 @@ sub preprocess {
 	return "externaldemo plugin preprocessing on $title!";
 }
 
-sub formattime {
-	print STDERR "externaldemo plugin's formattime called via RPC";
-	return scalar "formatted time: ".localtime(shift);
+sub bob {
+	print STDERR "externaldemo plugin's bob called via RPC";
 }
 
 # Now all that's left to do is loop and handle each incoming RPC request.
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 335575f02..4452ea8dc 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: 2008-10-19 20:06-0400\n"
+"POT-Creation-Date: 2008-10-21 17:51-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"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1175
 msgid "Error"
 msgstr ""
 
@@ -913,25 +913,25 @@ msgstr ""
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:459
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:505
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:534
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1165
+#: ../IkiWiki.pm:1158
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1674
+#: ../IkiWiki.pm:1667
 msgid "yes"
 msgstr ""
 
-- 
cgit v1.2.3


From 479d65faa0c9f73d28152ed19ea2e5c2264cae25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 22 Oct 2008 12:33:28 -0400
Subject: Updated Spanish translation from the ever vigilant Victor Moral.

---
 debian/changelog |  1 +
 po/es.po         | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index e1baea8ce..2c02db5f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     (This is a scary thing that grubs through the symbol table, and replaces
     all exported occurances of a function with the injected version.)
   * external: RPC functions can be injected to replace exported functions.
+  * Updated Spanish translation from the ever vigilant Victor Moral.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/po/es.po b/po/es.po
index b0632e865..ebe7bd06a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-10-19 19:12-0400\n"
-"PO-Revision-Date: 2008-10-07 12:44+0200\n"
+"PO-Revision-Date: 2008-10-22 13:54+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "%s caducada"
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
 msgid "last checked %s"
-msgstr ""
+msgstr "última comprobación el %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -248,13 +248,13 @@ msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
 #: ../IkiWiki/Plugin/google.pm:27
-#, fuzzy, perl-format
+#, perl-format
 msgid "Must specify %s when using the google search plugin"
-msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda"
+msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda de google"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
+msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
 #: ../IkiWiki/Plugin/googlecalendar.pm:32
 msgid "failed to find url in html"
@@ -974,8 +974,7 @@ msgstr "¿ Qué sistema de control de versiones empleará ?"
 #: ../auto.setup:20
 msgid "What wiki user (or openid) will be wiki admin?"
 msgstr ""
-"¿ Qué usuario del wiki (ó identificador openid) será el administrador del "
-"wiki ? "
+"¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? "
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
-- 
cgit v1.2.3


From 534f7144782ba6a453d5befed4faa7d6657d5fdc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 22 Oct 2008 17:05:23 -0400
Subject: Updated Danish translation from Jonas Smedegaard. Closes: #503117

---
 debian/changelog |   1 +
 po/da.po         | 166 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 86 insertions(+), 81 deletions(-)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 2c02db5f1..dfc754d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     all exported occurances of a function with the injected version.)
   * external: RPC functions can be injected to replace exported functions.
   * Updated Spanish translation from the ever vigilant Victor Moral.
+  * Updated Danish translation from Jonas Smedegaard. Closes: #503117
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/po/da.po b/po/da.po
index 830e91da2..6582f7762 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
-"PO-Revision-Date: 2008-08-11 01:04+0200\n"
+"POT-Creation-Date: 2008-10-22 18:58+0200\n"
+"PO-Revision-Date: 2008-10-22 19:13+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Danish\n"
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -27,7 +27,8 @@ msgstr "Du skal først logge på."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350
+#: ../IkiWiki/CGI.pm:163
+#: ../IkiWiki/Plugin/editpage.pm:350
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
@@ -51,7 +52,9 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385
+#: ../IkiWiki/CGI.pm:386
+#: ../IkiWiki.pm:1166
 msgid "Error"
 msgstr "Fejl"
 
@@ -92,8 +95,8 @@ msgstr "udløber %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "last checked %s"
-msgstr ""
+msgid "processed ok at %s"
+msgstr "korrekt dannet ved %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -132,7 +135,8 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38
+#: ../ikiwiki.in:199
 msgid "done"
 msgstr "færdig"
 
@@ -153,20 +157,20 @@ msgstr "Arkivering af fil i S3 mislykkedes: "
 msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/attachment.pm:49
+#: ../IkiWiki/Plugin/attachment.pm:48
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "der er allerede en side ved navn %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:82
+#: ../IkiWiki/Plugin/attachment.pm:81
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:190
+#: ../IkiWiki/Plugin/attachment.pm:189
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:232
+#: ../IkiWiki/Plugin/attachment.pm:231
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
@@ -174,9 +178,12 @@ msgstr "vedhæftningsoplægning"
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
+#: ../IkiWiki/Plugin/brokenlinks.pm:33
+#: ../IkiWiki/Plugin/editpage.pm:261
+#: ../IkiWiki/Plugin/inline.pm:327
+#: ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/orphans.pm:37
+#: ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
 msgstr "diskussion"
@@ -190,8 +197,10 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:27
+#: ../IkiWiki/Plugin/cutpaste.pm:30
+#: ../IkiWiki/Plugin/cutpaste.pm:45
+#: ../IkiWiki/Plugin/cutpaste.pm:61
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
@@ -207,9 +216,9 @@ msgid "no text was copied in this page with id %s"
 msgstr "ingen tekst blev kopieret i denne side med id %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:40
-#, fuzzy, perl-format
+#, perl-format
 msgid "removing old preview %s"
-msgstr "fjerner gammel side %s"
+msgstr "fjerner gammelt smugkig %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
@@ -221,8 +230,10 @@ msgstr "%s er ikke en redigérbar side"
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363
-#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408
+#: ../IkiWiki/Plugin/editpage.pm:335
+#: ../IkiWiki/Plugin/editpage.pm:363
+#: ../IkiWiki/Plugin/editpage.pm:373
+#: ../IkiWiki/Plugin/editpage.pm:408
 #: ../IkiWiki/Plugin/editpage.pm:453
 #, perl-format
 msgid "editing %s"
@@ -250,13 +261,13 @@ msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
 #: ../IkiWiki/Plugin/google.pm:27
-#, fuzzy, perl-format
+#, perl-format
 msgid "Must specify %s when using the google search plugin"
-msgstr "Skal angive %s når søgeudvidelsen bruges"
+msgstr "Skal angive %s når google søgeudvidelsen bruges"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr ""
+msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn"
 
 #: ../IkiWiki/Plugin/googlecalendar.pm:32
 msgid "failed to find url in html"
@@ -279,7 +290,8 @@ msgstr "Image::Magick ikke installeret"
 msgid "bad size \"%s\""
 msgstr "forkert størrelse \"%s\""
 
-#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
+#: ../IkiWiki/Plugin/img.pm:80
+#: ../IkiWiki/Plugin/img.pm:84
 #: ../IkiWiki/Plugin/img.pm:101
 #, perl-format
 msgid "failed to read %s: %s"
@@ -300,9 +312,8 @@ msgid "Must specify url to wiki with --url when using --rss or --atom"
 msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes"
 
 #: ../IkiWiki/Plugin/inline.pm:139
-#, fuzzy
 msgid "page editing not allowed"
-msgstr "ring af henvisninger er ikke tilladt"
+msgstr "sideredigering er ikke tilladt"
 
 #: ../IkiWiki/Plugin/inline.pm:156
 msgid "missing pages parameter"
@@ -322,7 +333,8 @@ msgstr "Tilføj nyt indlæg med følgende titel:"
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:335
+#: ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -334,22 +346,20 @@ msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
-#, fuzzy, perl-format
+#: ../IkiWiki/Plugin/lockedit.pm:49
+#: ../IkiWiki/Plugin/lockedit.pm:66
+#, perl-format
 msgid "%s is locked and cannot be edited"
-msgstr "%s er låst af %s og kan ikke redigeres"
+msgstr "%s er låst og kan ikke redigeres"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr ""
-"multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
+msgstr "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
-msgstr ""
-"Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
-"mislykkedes"
+msgstr "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) mislykkedes"
 
 #: ../IkiWiki/Plugin/meta.pm:150
 msgid "stylesheet not found"
@@ -405,8 +415,7 @@ msgstr "Fejl ved kontooprettelse."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:257
 msgid "No email address, so cannot email password reset instructions."
-msgstr ""
-"Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
+msgstr "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:291
 msgid "Failed to send mail"
@@ -535,13 +544,13 @@ msgid "at noon on %A"
 msgstr "midt på dagen %A"
 
 #: ../IkiWiki/Plugin/progress.pm:34
-#, fuzzy, perl-format
+#, perl-format
 msgid "illegal percent value %s"
-msgstr "ugyldigt navn"
+msgstr "ugyldigt procentværdi %s"
 
 #: ../IkiWiki/Plugin/progress.pm:59
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
-msgstr ""
+msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`"
 
 #: ../IkiWiki/Plugin/recentchanges.pm:100
 msgid "missing page"
@@ -556,7 +565,8 @@ msgstr "Siden %s eksisterer ikke."
 msgid "(Diff truncated)"
 msgstr "(Diff trunkeret)"
 
-#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:31
+#: ../IkiWiki/Plugin/rename.pm:36
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s eksisterer ikke"
@@ -566,7 +576,8 @@ msgstr "%s eksisterer ikke"
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s er ikke i srcdir, så kan ikke blive slettet"
 
-#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:41
+#: ../IkiWiki/Plugin/rename.pm:45
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s er ikke en fil"
@@ -615,7 +626,7 @@ msgstr "omdøb %s"
 
 #: ../IkiWiki/Plugin/rename.pm:138
 msgid "Also rename SubPages and attachments"
-msgstr ""
+msgstr "Omdøb også UnderSider og vedhæftninger"
 
 #: ../IkiWiki/Plugin/rename.pm:224
 msgid "Only one attachment can be renamed at a time."
@@ -749,54 +760,49 @@ msgstr "billedopbygning fra kode mislykkedes"
 
 #: ../IkiWiki/Plugin/websetup.pm:89
 msgid "plugin"
-msgstr ""
+msgstr "udvidelse"
 
 #: ../IkiWiki/Plugin/websetup.pm:108
-#, fuzzy, perl-format
+#, perl-format
 msgid "enable %s?"
-msgstr "omdøb %s"
+msgstr "aktivér %s?"
 
 #: ../IkiWiki/Plugin/websetup.pm:236
 msgid "you are not logged in as an admin"
-msgstr ""
+msgstr "du er ikke logget på som en administrator"
 
 #: ../IkiWiki/Plugin/websetup.pm:240
 msgid "setup file for this wiki is not known"
-msgstr ""
+msgstr "opsætningsfilen for denne wiki er ukendt"
 
 #: ../IkiWiki/Plugin/websetup.pm:256
-#, fuzzy
 msgid "main"
-msgstr "Admin"
+msgstr "primær"
 
 #: ../IkiWiki/Plugin/websetup.pm:257
 msgid "plugins"
-msgstr ""
+msgstr "udvidelser"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
-msgid ""
-"The configuration changes shown below require a wiki rebuild to take effect."
-msgstr ""
+msgid "The configuration changes shown below require a wiki rebuild to take effect."
+msgstr "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i kraft."
 
 #: ../IkiWiki/Plugin/websetup.pm:399
-msgid ""
-"For the configuration changes shown below to fully take effect, you may need "
-"to rebuild the wiki."
-msgstr ""
+msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki."
+msgstr "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du muligvis genopbygge wikien."
 
 #: ../IkiWiki/Plugin/websetup.pm:433
 #, perl-format
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
-msgstr ""
+msgstr "<p class=\"error\">Fejl: %s sluttede med fejl (%s)"
 
 #: ../IkiWiki/Render.pm:253
 #, perl-format
-msgid ""
-"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
-"allow this"
-msgstr ""
+msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"
+msgstr "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir for at tillade dette"
 
-#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:277
+#: ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
@@ -804,7 +810,7 @@ msgstr "udelader forkert filnavn %s"
 #: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
-msgstr ""
+msgstr "%s har flere mulige kildesider"
 
 #: ../IkiWiki/Render.pm:360
 #, perl-format
@@ -855,16 +861,16 @@ msgstr "kan ikke læse %s: %s"
 
 #: ../IkiWiki/Setup/Automator.pm:33
 msgid "you must enter a wikiname (that contains alphanumerics)"
-msgstr ""
+msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
 
 #: ../IkiWiki/Setup/Automator.pm:67
 #, perl-format
 msgid "unsupported revision control system %s"
-msgstr ""
+msgstr "revisionskontrolsystem %s ikke understøttet"
 
 #: ../IkiWiki/Setup/Automator.pm:83
 msgid "failed to set up the repository with ikiwiki-makerepo"
-msgstr ""
+msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -904,7 +910,7 @@ msgstr "brug: ikiwiki [valg] kilde mål"
 
 #: ../ikiwiki.in:14
 msgid "       ikiwiki --setup configfile"
-msgstr ""
+msgstr "       ikiwiki --setup opsætningsfil"
 
 #: ../ikiwiki.in:90
 msgid "usage: --set var=value"
@@ -928,41 +934,39 @@ msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
 #: ../IkiWiki.pm:504
 msgid "cannot use multiple rcs plugins"
-msgstr ""
+msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
 #: ../IkiWiki.pm:533
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
-msgstr ""
+msgstr "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1149
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1658
 msgid "yes"
 msgstr "ja"
 
 #: ../auto.setup:16
 msgid "What will the wiki be named?"
-msgstr ""
+msgstr "Hvad skal wikien hedde?"
 
 #: ../auto.setup:16
 msgid "wiki"
-msgstr ""
+msgstr "wiki"
 
 #: ../auto.setup:18
 msgid "What revision control system to use?"
-msgstr ""
+msgstr "Hvilket revisionskontrolsystem skal bruges?"
 
 #: ../auto.setup:20
 msgid "What wiki user (or openid) will be wiki admin?"
-msgstr ""
+msgstr "Hvilken wiki bruger (eller openid) skal være administrator?"
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
-msgstr ""
+msgstr "Hvad er domænenavnet på webserveren?"
 
-#~ msgid "processed ok at %s"
-#~ msgstr "korrekt dannet ved %s"
-- 
cgit v1.2.3


From 8821ba3a590ac25299f17c164f7d0755c5ea97e4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 14:08:45 -0400
Subject: Optimise the no-op post-commit hook in the web edit case by skipping
 loading plugins. (Particularly a win when using external plugins.)

---
 debian/changelog | 2 ++
 ikiwiki.in       | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index dfc754d65..49bd85447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * external: RPC functions can be injected to replace exported functions.
   * Updated Spanish translation from the ever vigilant Victor Moral.
   * Updated Danish translation from Jonas Smedegaard. Closes: #503117
+  * Optimise the no-op post-commit hook in the web edit case by skipping
+    loading plugins. (Particularly a win when using external plugins.)
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/ikiwiki.in b/ikiwiki.in
index 4f24cfc2e..fd21b4911 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,12 @@ sub getconfig () { #{{{
 			error("WRAPPED_OPTIONS: $@");
 		}
 		delete $ENV{WRAPPED_OPTIONS};
+
+		# optimisation for no-op post_commit 
+		if ($config{post_commit} && ! commit_hook_enabled()) {
+			exit 0;
+		}
+
 		loadplugins();
 		checkconfig();
 	}
-- 
cgit v1.2.3


From 85f4b99710fa94b9b67cee061c37eaf49be36b25 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 18:05:57 -0400
Subject: untrusted committers code seems to be fully working

Still need to investigate possible races, and test some more.
---
 IkiWiki.pm            |  4 ++--
 IkiWiki/Plugin/git.pm | 10 ++++++----
 debian/changelog      |  2 ++
 ikiwiki.in            |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 698244187..1a55945a8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1582,8 +1582,8 @@ sub rcs_getctime ($) { #{{{
 	$hooks{rcs}{rcs_getctime}{call}->(@_);
 } #}}}
 
-sub rcs_receive ($) { #{{{
-	$hooks{rcs}{rcs_receive}{call}->(@_);
+sub rcs_receive () { #{{{
+	$hooks{rcs}{rcs_receive}{call}->();
 } #}}}
 
 sub globlist_to_pagespec ($) { #{{{
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index bdac6f7a1..e565f6369 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -365,8 +365,10 @@ sub git_commit_info ($;$) { #{{{
 	# starting from the given sha1sum.
 	my ($sha1, $num) = @_;
 
-	my @raw_lines = run_or_die('git', 'log',
-		(defined $num ? "--max-count=$num" : ""), 
+	my @opts;
+	push @opts, "--max-count=$num" if defined $num;
+
+	my @raw_lines = run_or_die('git', 'log', @opts,
 		'--pretty=raw', '--raw', '--abbrev=40', '--always', '-c',
 		'-r', $sha1, '--', '.');
 	my ($prefix) = run_or_die('git', 'rev-parse', '--show-prefix');
@@ -645,7 +647,7 @@ sub rcs_receive () { #{{{
 						eval q{use File::Temp};
 						die $@ if $@;
 						my $fh;
-						($fh, $path)=tempfile("XXXXXXXXXX", UNLINK => 1);
+						($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1);
 						if (system("git show ".$detail->{sha1_to}." > '$path'") != 0) {
 							error("failed writing temp file");
 						}
@@ -678,7 +680,7 @@ sub rcs_receive () { #{{{
 		}
 	}
 
-	return @rets;
+	return reverse @rets;
 } #}}}
 
 1
diff --git a/debian/changelog b/debian/changelog
index 49bd85447..d8e26e4c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Updated Danish translation from Jonas Smedegaard. Closes: #503117
   * Optimise the no-op post-commit hook in the web edit case by skipping
     loading plugins. (Particularly a win when using external plugins.)
+  * Add support for checking pushes from untrusted git committers. This can be
+    used to set up anonymous git pushes, and other similar things.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/ikiwiki.in b/ikiwiki.in
index 60663bc89..d601d2739 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -156,7 +156,8 @@ sub main () { #{{{
 					if exists $config{setupsyslog};
 				delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
 				checkconfig();
-				if (! $config{cgi} && ! $config{post_commit}) {
+				if (! $config{cgi} && ! $config{post_commit} &&
+				    ! $config{test_receive}) {
 					$config{post_commit}=1;
 				}
 				gen_wrapper();
-- 
cgit v1.2.3


From d3d399941061d95cd4aae6ae2cf7594a4e5e7452 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 26 Oct 2008 15:13:04 -0400
Subject: do no-op post_commit test in wrapper

This speeds up web commits by 1/4th of a second or so, since perl does
not have to start up for the post commit hook.

perl's locking is completly FuBar, since it's impossible to tell what perl
flock() really does, and thus difficult to write code in other languages
that interoperates with perl's locking. (Let alone interoperating with
existing fcntl locking from perl...)

In this particular case, I think I was able to find a way to avoid the
insanity, mostly. The C code does a true flock(2), and if perl is using an
incompatable lock method that does not use the same locking primative at
the kernel level, then the C code's test will fail, and it will go ahead
and run the perl code. Then the perl code's test will test the right thing.

On Debian, at least lately, perl's flock() does a true flock(2), so the
optimisation does work.
---
 IkiWiki/Wrapper.pm |  31 ++++++++++-
 debian/changelog   |   4 +-
 ikiwiki.in         |   5 --
 po/bg.po           |  57 +++++++++++++++-----
 po/cs.po           |  57 +++++++++++++++-----
 po/da.po           | 154 ++++++++++++++++++++++++++++++++---------------------
 po/de.po           |  57 +++++++++++++++-----
 po/es.po           |  69 ++++++++++++++++++------
 po/fr.po           |  59 +++++++++++++++-----
 po/gu.po           |  57 +++++++++++++++-----
 po/ikiwiki.pot     |  57 +++++++++++++++-----
 po/pl.po           |  57 +++++++++++++++-----
 po/sv.po           |  57 +++++++++++++++-----
 po/vi.po           |  57 +++++++++++++++-----
 14 files changed, 566 insertions(+), 212 deletions(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index fd8a0e5b0..99237d3b5 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -31,7 +31,7 @@ sub gen_wrapper () { #{{{
 		       HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi};
 	my $envsave="";
 	foreach my $var (@envsave) {
-		$envsave.=<<"EOF"
+		$envsave.=<<"EOF";
 	if ((s=getenv("$var")))
 		addenv("$var", s);
 EOF
@@ -43,6 +43,31 @@ EOF
 		$test_receive=IkiWiki::Receive::gen_wrapper();
 	}
 
+	my $check_commit_hook="";
+	if ($config{post_commit}) {
+		# Optimise checking !commit_hook_enabled() , 
+		# so that ikiwiki does not have to be started if the
+		# hook is disabled.
+		#
+		# Note that perl's flock may be implemented using fcntl
+		# or lockf on some systems. If so, and if there is no
+		# interop between the locking systems, the true C flock will
+		# always succeed, and this optimisation won't work.
+		# The perl code will later correctly check the lock,
+		# so the right thing will still happen, though without
+		# the benefit of this optimisation.
+		$check_commit_hook=<<"EOF";
+	{
+		int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR);
+		if (fd != -1) {
+			if (flock(fd, LOCK_SH | LOCK_NB) != 0)
+				exit(0);
+			close(fd);
+		}
+	}
+EOF
+	}
+
 	$Data::Dumper::Indent=0; # no newlines
 	my $configstring=Data::Dumper->Dump([\%config], ['*config']);
 	$configstring=~s/\\/\\\\/g;
@@ -56,9 +81,12 @@ EOF
 /* A wrapper for ikiwiki, can be safely made suid. */
 #include <stdio.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/file.h>
 
 extern char **environ;
 char *newenviron[$#envsave+6];
@@ -75,6 +103,7 @@ addenv(char *var, char *val) {
 int main (int argc, char **argv) {
 	char *s;
 
+$check_commit_hook
 $test_receive
 $envsave
 	newenviron[i++]="HOME=$ENV{HOME}";
diff --git a/debian/changelog b/debian/changelog
index d8e26e4c9..63556c941 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * external: RPC functions can be injected to replace exported functions.
   * Updated Spanish translation from the ever vigilant Victor Moral.
   * Updated Danish translation from Jonas Smedegaard. Closes: #503117
-  * Optimise the no-op post-commit hook in the web edit case by skipping
-    loading plugins. (Particularly a win when using external plugins.)
+  * Optimise the no-op post-commit hook, to speed up web edits by a fraction
+    of a second.
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
 
diff --git a/ikiwiki.in b/ikiwiki.in
index f2407b8d0..af5cabdc0 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -119,11 +119,6 @@ sub getconfig () { #{{{
 		}
 		delete $ENV{WRAPPED_OPTIONS};
 
-		if ($config{post_commit} && ! commit_hook_enabled()) {
-			# optimisation for no-op post_commit 
-			exit 0;
-		}
-
 		loadplugins();
 		checkconfig();
 	}
diff --git a/po/bg.po b/po/bg.po
index 9167079fa..471e03119 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -49,7 +49,7 @@ msgstr "Предпочитанията са запазени."
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Грешка"
 
@@ -131,7 +131,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "готово"
 
@@ -212,6 +212,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "премахване на старата страница „%s”"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -253,6 +257,21 @@ msgstr "грешка при обработване на шаблона"
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -816,6 +835,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "пропускане на невалидното име на файл „%s”"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -908,19 +937,19 @@ msgstr "не е указан файл на обвивката"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "крешка при компилиране на файла %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "успешно генериране на %s"
@@ -937,39 +966,39 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "При използване на пареметъра „--cgi” е необходимо да се укаже и "
 "местоположението на уикито чрез параметъра „--url”"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 80d8bf999..ece992c47 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr "Nastavení uloženo."
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Chyba"
 
@@ -128,7 +128,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "hotovo"
 
@@ -209,6 +209,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "odstraňuji starou stránku %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -250,6 +254,21 @@ msgstr "nepodařilo se zpracovat:"
 msgid "fortune failed"
 msgstr "fortune selhal"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -797,6 +816,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "přeskakuji chybné jméno souboru %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -889,19 +918,19 @@ msgstr "jméno souboru s obalem nebylo zadáno"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "nelze zapsat %s: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "nelze zkompilovat %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s byl úspěšně vytvořen"
@@ -918,37 +947,37 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "znovu vytvářím wiki..."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 6582f7762..3d0deca8a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 18:58+0200\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2008-10-22 19:13+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -27,8 +27,7 @@ msgstr "Du skal først logge på."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:163
-#: ../IkiWiki/Plugin/editpage.pm:350
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
@@ -52,9 +51,7 @@ msgstr "Indstillinger gemt"
 msgid "You are banned."
 msgstr "Du er banlyst."
 
-#: ../IkiWiki/CGI.pm:385
-#: ../IkiWiki/CGI.pm:386
-#: ../IkiWiki.pm:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Fejl"
 
@@ -95,8 +92,8 @@ msgstr "udløber %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
-msgstr "korrekt dannet ved %s"
+msgid "last checked %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -135,8 +132,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38
-#: ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "færdig"
 
@@ -157,20 +153,20 @@ msgstr "Arkivering af fil i S3 mislykkedes: "
 msgid "Failed to delete file from S3: "
 msgstr "Sletning af fil fra S3 mislykkedes: "
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "der er allerede en side ved navn %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr "forhindret af allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "dårligt vedhæftningsfilnavn"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "vedhæftningsoplægning"
 
@@ -178,12 +174,9 @@ msgstr "vedhæftningsoplægning"
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33
-#: ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:327
-#: ../IkiWiki/Plugin/opendiscussion.pm:26
-#: ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Render.pm:79
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
+#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
 msgstr "diskussion"
@@ -197,10 +190,8 @@ msgstr "%s fra %s"
 msgid "There are no broken links!"
 msgstr "Ingen henvisninger der ikker fungerer!"
 
-#: ../IkiWiki/Plugin/conditional.pm:27
-#: ../IkiWiki/Plugin/cutpaste.pm:30
-#: ../IkiWiki/Plugin/cutpaste.pm:45
-#: ../IkiWiki/Plugin/cutpaste.pm:61
+#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30
+#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61
 #: ../IkiWiki/Plugin/testpagespec.pm:26
 #, perl-format
 msgid "%s parameter is required"
@@ -220,6 +211,11 @@ msgstr "ingen tekst blev kopieret i denne side med id %s"
 msgid "removing old preview %s"
 msgstr "fjerner gammelt smugkig %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+#, fuzzy
+msgid "bad page name"
+msgstr "dårligt vedhæftningsfilnavn"
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -230,10 +226,8 @@ msgstr "%s er ikke en redigérbar side"
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:335
-#: ../IkiWiki/Plugin/editpage.pm:363
-#: ../IkiWiki/Plugin/editpage.pm:373
-#: ../IkiWiki/Plugin/editpage.pm:408
+#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363
+#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408
 #: ../IkiWiki/Plugin/editpage.pm:453
 #, perl-format
 msgid "editing %s"
@@ -260,6 +254,22 @@ msgstr "dannelsen mislykkedes"
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, fuzzy, perl-format
+msgid "you are not allowed to change %s"
+msgstr "du er ikke logget på som en administrator"
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+#, fuzzy
+msgid "you are not allowed to change file modes"
+msgstr "du er ikke logget på som en administrator"
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -290,8 +300,7 @@ msgstr "Image::Magick ikke installeret"
 msgid "bad size \"%s\""
 msgstr "forkert størrelse \"%s\""
 
-#: ../IkiWiki/Plugin/img.pm:80
-#: ../IkiWiki/Plugin/img.pm:84
+#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84
 #: ../IkiWiki/Plugin/img.pm:101
 #, perl-format
 msgid "failed to read %s: %s"
@@ -333,8 +342,7 @@ msgstr "Tilføj nyt indlæg med følgende titel:"
 msgid "nonexistant template %s"
 msgstr "ikke-eksisterende skabelon: %s"
 
-#: ../IkiWiki/Plugin/inline.pm:335
-#: ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -346,20 +354,22 @@ msgstr "RPC::XML::Client ikke fundet, pinger ikke"
 msgid "failed to run dot"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/lockedit.pm:49
-#: ../IkiWiki/Plugin/lockedit.pm:66
+#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "%s er låst og kan ikke redigeres"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
+msgstr ""
+"multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
-msgstr "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) mislykkedes"
+msgstr ""
+"Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) "
+"mislykkedes"
 
 #: ../IkiWiki/Plugin/meta.pm:150
 msgid "stylesheet not found"
@@ -415,7 +425,8 @@ msgstr "Fejl ved kontooprettelse."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:257
 msgid "No email address, so cannot email password reset instructions."
-msgstr "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
+msgstr ""
+"Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:291
 msgid "Failed to send mail"
@@ -565,8 +576,7 @@ msgstr "Siden %s eksisterer ikke."
 msgid "(Diff truncated)"
 msgstr "(Diff trunkeret)"
 
-#: ../IkiWiki/Plugin/remove.pm:31
-#: ../IkiWiki/Plugin/rename.pm:36
+#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36
 #, perl-format
 msgid "%s does not exist"
 msgstr "%s eksisterer ikke"
@@ -576,8 +586,7 @@ msgstr "%s eksisterer ikke"
 msgid "%s is not in the srcdir, so it cannot be deleted"
 msgstr "%s er ikke i srcdir, så kan ikke blive slettet"
 
-#: ../IkiWiki/Plugin/remove.pm:41
-#: ../IkiWiki/Plugin/rename.pm:45
+#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45
 #, perl-format
 msgid "%s is not a file"
 msgstr "%s er ikke en fil"
@@ -784,25 +793,45 @@ msgid "plugins"
 msgstr "udvidelser"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
-msgid "The configuration changes shown below require a wiki rebuild to take effect."
-msgstr "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i kraft."
+msgid ""
+"The configuration changes shown below require a wiki rebuild to take effect."
+msgstr ""
+"Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
+"kraft."
 
 #: ../IkiWiki/Plugin/websetup.pm:399
-msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki."
-msgstr "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du muligvis genopbygge wikien."
+msgid ""
+"For the configuration changes shown below to fully take effect, you may need "
+"to rebuild the wiki."
+msgstr ""
+"For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
+"muligvis genopbygge wikien."
 
 #: ../IkiWiki/Plugin/websetup.pm:433
 #, perl-format
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr "<p class=\"error\">Fejl: %s sluttede med fejl (%s)"
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "udelader forkert filnavn %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
-msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"
-msgstr "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir for at tillade dette"
+msgid ""
+"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
+"allow this"
+msgstr ""
+"symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
+"for at tillade dette"
 
-#: ../IkiWiki/Render.pm:277
-#: ../IkiWiki/Render.pm:302
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
@@ -887,19 +916,19 @@ msgstr "wrapper-navn ikke angivet"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "skrivning ad %s mislykkedes: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "kompilering af %s mislykkedes"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "Korrekt bygget %s"
@@ -916,37 +945,38 @@ msgstr "       ikiwiki --setup opsætningsfil"
 msgid "usage: --set var=value"
 msgstr "brug: --set var=værdi"
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Skal angive url til wiki med --url når der bruges --cgi"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
-msgstr "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
+msgstr ""
+"indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr "ja"
 
@@ -970,3 +1000,5 @@ msgstr "Hvilken wiki bruger (eller openid) skal være administrator?"
 msgid "What is the domain name of the web server?"
 msgstr "Hvad er domænenavnet på webserveren?"
 
+#~ msgid "processed ok at %s"
+#~ msgstr "korrekt dannet ved %s"
diff --git a/po/de.po b/po/de.po
index b76ddeac9..bef54ad89 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2008-03-03 21:22+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -47,7 +47,7 @@ msgstr "Einstellungen gespeichert."
 msgid "You are banned."
 msgstr "Sie sind ausgeschlossen worden."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Fehler"
 
@@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "fertig"
 
@@ -209,6 +209,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "entferne alte Seite %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -247,6 +251,21 @@ msgstr "Bearbeitung fehlgeschlagen"
 msgid "fortune failed"
 msgstr "»fortune« fehlgeschlagen"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -792,6 +811,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "überspringe fehlerhaften Dateinamen %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -884,19 +913,19 @@ msgstr "Dateiname des Wrappers nicht angegeben"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "schreiben von %s fehlgeschlagen: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "erzeugen von %s fehlgeschlagen"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s wurde erfolgreich erstellt"
@@ -913,39 +942,39 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr "Benutzung: --set Variable=Wert"
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
 "wird"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife %s auf Seite %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ebe7bd06a..7afb45c14 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2008-10-22 13:54+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Error"
 
@@ -130,7 +130,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "completado"
 
@@ -209,6 +209,11 @@ msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina"
 msgid "removing old preview %s"
 msgstr "eliminando la antigua previsualización %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+#, fuzzy
+msgid "bad page name"
+msgstr "nombre de archivo adjunto erróneo"
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -247,14 +252,33 @@ msgstr "fallo en el proceso"
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, fuzzy, perl-format
+msgid "you are not allowed to change %s"
+msgstr "No está registrado como un administrador"
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+#, fuzzy
+msgid "you are not allowed to change file modes"
+msgstr "No está registrado como un administrador"
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, perl-format
 msgid "Must specify %s when using the google search plugin"
-msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda de google"
+msgstr ""
+"Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda de "
+"google"
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
-msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio"
+msgstr ""
+"Error en el análisis del URL, no puedo determinar el nombre del dominio"
 
 #: ../IkiWiki/Plugin/googlecalendar.pm:32
 msgid "failed to find url in html"
@@ -795,6 +819,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr "<p class=\"error\">Error: %s finaliza con código distinto de cero (%s)"
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "ignorando el archivo %s porque su nombre no es correcto"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -892,19 +926,19 @@ msgstr "el programa envoltorio no ha sido especificado"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "no puedo escribir en %s: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "ha fallado la compilación del programa %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "creado con éxito el programa envoltorio %s"
@@ -921,41 +955,41 @@ msgstr "       ikiwiki --setup archivo_de_configuración"
 msgid "usage: --set var=value"
 msgstr "uso: --set variable=valor"
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Es obligatorio especificar un url al wiki con el parámetro --url si se "
 "utiliza el parámetro --cgi"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr "no puedo emplear varios complementos rcs"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "no he podido cargar el complemento externo %s necesario para %s"
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "se ha detectado en la página %s un bucle de preprocesado en la iteración "
 "número %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr "si"
 
@@ -974,7 +1008,8 @@ msgstr "¿ Qué sistema de control de versiones empleará ?"
 #: ../auto.setup:20
 msgid "What wiki user (or openid) will be wiki admin?"
 msgstr ""
-"¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? "
+"¿ Qué usuario del wiki (ó identificador openid) será el administrador del "
+"wiki ? "
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
diff --git a/po/fr.po b/po/fr.po
index 04145eeb7..c0c96c476 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2008-10-11 10:34+0200\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Les préférences ont été enregistrées."
 msgid "You are banned."
 msgstr "Vous avez été banni."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Erreur"
 
@@ -133,7 +133,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "suppression du compartiment (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "Terminé"
 
@@ -216,6 +216,11 @@ msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s"
 msgid "removing old preview %s"
 msgstr "Suppression de l'ancienne prévisualisation %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+#, fuzzy
+msgid "bad page name"
+msgstr "Mauvais nom de la pièce jointe"
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -254,6 +259,22 @@ msgstr "Échec du traitement"
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, fuzzy, perl-format
+msgid "you are not allowed to change %s"
+msgstr "vous n'êtes pas authentifié comme administrateur"
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+#, fuzzy
+msgid "you are not allowed to change file modes"
+msgstr "vous n'êtes pas authentifié comme administrateur"
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -805,6 +826,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr "<p class=\"erreur\">Erreur: %s a quitté nonzero (%s)"
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "Omission du fichier au nom incorrect %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -902,19 +933,19 @@ msgstr "Le nom du fichier CGI n'a pas été indiqué"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "Échec de l'écriture de %s : %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "Échec de la compilation de %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s a été créé avec succès"
@@ -932,39 +963,39 @@ msgstr "       ikiwiki --setup fichier de configuration"
 msgid "usage: --set var=value"
 msgstr "Syntaxe : -- set var=valeur"
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de "
 "--cgi"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr "impossible d'utiliser plusieurs systèmes de contrôle des versions"
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, fuzzy, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr "oui"
 
diff --git a/po/gu.po b/po/gu.po
index 82ecfad22..c48985eb5 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -48,7 +48,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -129,7 +129,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -210,6 +210,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -251,6 +255,21 @@ msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -797,6 +816,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -889,19 +918,19 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
@@ -918,37 +947,37 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 4452ea8dc..cbae46752 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: 2008-10-21 17:51-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-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"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1175
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr ""
 
@@ -208,6 +208,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr ""
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -246,6 +250,21 @@ msgstr ""
 msgid "fortune failed"
 msgstr ""
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -780,6 +799,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, perl-format
+msgid "bad file name %s"
+msgstr ""
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -872,19 +901,19 @@ msgstr ""
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr ""
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr ""
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr ""
@@ -901,37 +930,37 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr ""
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr ""
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr ""
 
-#: ../IkiWiki.pm:459
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 
-#: ../IkiWiki.pm:505
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:534
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1158
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1667
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 4a216123d..6f262a2be 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -51,7 +51,7 @@ msgstr "Preferencje zapisane."
 msgid "You are banned."
 msgstr "Twój dostęp został zabroniony przez administratora."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Błąd"
 
@@ -133,7 +133,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "gotowe"
 
@@ -214,6 +214,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "usuwanie starej strony %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -255,6 +259,21 @@ msgstr "awaria w trakcie przetwarzania:"
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -822,6 +841,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "pomijanie nieprawidłowej nazwy pliku %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -914,19 +943,19 @@ msgstr "nieokreślona nazwa pliku osłony"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "awaria w trakcie kompilowania %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "pomyślnie utworzono %s"
@@ -943,39 +972,39 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr ""
 "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru "
 "--url"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index cdb02559f..cc83869cf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -48,7 +48,7 @@ msgstr "Inställningar sparades."
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Fel"
 
@@ -130,7 +130,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "klar"
 
@@ -211,6 +211,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "tar bort gammal sida %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -252,6 +256,21 @@ msgstr "misslyckades med att behandla mall:"
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -811,6 +830,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "hoppar över felaktigt filnamn %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -903,19 +932,19 @@ msgstr "filnamn för wrapper har inte angivits"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "misslyckades med att skriva %s: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "misslyckades med att kompilera %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "generering av %s lyckades"
@@ -932,37 +961,37 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 5b19ab48b..13d695880 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-19 19:12-0400\n"
+"POT-Creation-Date: 2008-10-26 15:03-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -49,7 +49,7 @@ msgstr "Tùy thích đã được lưu."
 msgid "You are banned."
 msgstr "Bạn bị cấm ra."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr "Lỗi"
 
@@ -131,7 +131,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
 msgid "done"
 msgstr "xong"
 
@@ -212,6 +212,10 @@ msgstr ""
 msgid "removing old preview %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
+#: ../IkiWiki/Plugin/editpage.pm:125
+msgid "bad page name"
+msgstr ""
+
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
 msgid "%s is not an editable page"
@@ -253,6 +257,21 @@ msgstr "mẫu không xử lý được:"
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
+#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Receive.pm:129
+#, perl-format
+msgid "you are not allowed to change %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:657
+#, perl-format
+msgid "you cannot act on a file with mode %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/git.pm:661
+msgid "you are not allowed to change file modes"
+msgstr ""
+
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
@@ -812,6 +831,16 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
+#: ../IkiWiki/Receive.pm:35
+#, perl-format
+msgid "cannot determine id of untrusted committer %s"
+msgstr ""
+
+#: ../IkiWiki/Receive.pm:85
+#, fuzzy, perl-format
+msgid "bad file name %s"
+msgstr "đang bỏ qua tên tập tin sai %s"
+
 #: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
@@ -904,19 +933,19 @@ msgstr "chưa xác định tên tập tin bộ bao bọc"
 
 #. translators: The first parameter is a filename, and the second is
 #. translators: a (probably not translated) error message.
-#: ../IkiWiki/Wrapper.pm:48
+#: ../IkiWiki/Wrapper.pm:79
 #, perl-format
 msgid "failed to write %s: %s"
 msgstr "lỗi ghi %s: %s"
 
 #. translators: The parameter is a C filename.
-#: ../IkiWiki/Wrapper.pm:99
+#: ../IkiWiki/Wrapper.pm:135
 #, perl-format
 msgid "failed to compile %s"
 msgstr "lỗi biên dịch %s"
 
 #. translators: The parameter is a filename.
-#: ../IkiWiki/Wrapper.pm:119
+#: ../IkiWiki/Wrapper.pm:155
 #, perl-format
 msgid "successfully generated %s"
 msgstr "%s đã được tạo ra"
@@ -933,37 +962,37 @@ msgstr ""
 msgid "usage: --set var=value"
 msgstr ""
 
-#: ../ikiwiki.in:137
+#: ../ikiwiki.in:138
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:188
+#: ../ikiwiki.in:194
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:191
+#: ../ikiwiki.in:197
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-#: ../IkiWiki.pm:458
+#: ../IkiWiki.pm:466
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »"
 
-#: ../IkiWiki.pm:504
+#: ../IkiWiki.pm:512
 msgid "cannot use multiple rcs plugins"
 msgstr ""
 
-#: ../IkiWiki.pm:533
+#: ../IkiWiki.pm:541
 #, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1156
+#: ../IkiWiki.pm:1165
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1665
+#: ../IkiWiki.pm:1678
 msgid "yes"
 msgstr ""
 
-- 
cgit v1.2.3


From 8530e827b01a6eed8b8c933e758e152a1dc32035 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 27 Oct 2008 14:45:54 -0400
Subject: git: Allow [[sha1_commit]] to be used in the diffurl, to support
 cgit.

---
 IkiWiki/Plugin/git.pm                      | 3 ++-
 debian/changelog                           | 1 +
 doc/todo/provide_sha1_for_git_diffurl.mdwn | 4 +++-
 po/ikiwiki.pot                             | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 5bef92856..1a39d87e5 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -95,7 +95,7 @@ sub getsetup () { #{{{
 		diffurl => {
 			type => "string",
 			example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)",
+			description => "gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], [[sha1_commit]] and [[file]] substituted)",
 			safe => 1,
 			rebuild => 1,
 		},
@@ -521,6 +521,7 @@ sub rcs_recentchanges ($) { #{{{
 			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
 			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
 			$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
+			$diffurl =~ s/\[\[sha1_commit\]\]/$sha1/go;
 
 			push @pages, {
 				page => pagename($file),
diff --git a/debian/changelog b/debian/changelog
index 63556c941..299cf1af2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     of a second.
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
+  * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/todo/provide_sha1_for_git_diffurl.mdwn b/doc/todo/provide_sha1_for_git_diffurl.mdwn
index af785c3e6..dfd848058 100644
--- a/doc/todo/provide_sha1_for_git_diffurl.mdwn
+++ b/doc/todo/provide_sha1_for_git_diffurl.mdwn
@@ -18,4 +18,6 @@ diffurls of the following form:
      			$diffurl =~ s/\[\[sha1_parent\]\]/$ci->{'parent'}/go;
      			$diffurl =~ s/\[\[sha1_from\]\]/$detail->{'sha1_from'}/go;
      			$diffurl =~ s/\[\[sha1_to\]\]/$detail->{'sha1_to'}/go;
-     
+
+> [[done]], but I called it `sha1_commit` since I think that's what it's
+> actually a sha1 of. --[[Joey]]
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index cbae46752..7a2891ea5 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: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-26 20:44-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"
-- 
cgit v1.2.3


From 33a0e84ddbb9fe9c068cb40641ccec8554514151 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 14:20:31 -0400
Subject: fix preview of shortcuts

Move shortcut processing back to checkconfig, and avoid it failing if the
srcdir is not defined.
---
 IkiWiki/Plugin/shortcut.pm             | 18 ++++++++++--------
 debian/changelog                       |  1 +
 doc/bugs/cannot_preview_shortcuts.mdwn |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'debian/changelog')

diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 7bfce586f..77131edb0 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -7,7 +7,7 @@ use IkiWiki 2.00;
 
 sub import { #{{{
 	hook(type => "getsetup", id => "shortcut", call => \&getsetup);
-	hook(type => "refresh", id => "shortcut", call => \&refresh);
+	hook(type => "checkconfig", id => "shortcut", call => \&checkconfig);
 	hook(type => "preprocess", id => "shortcut", call => \&preprocess_shortcut);
 } #}}}
 
@@ -19,14 +19,16 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
-sub refresh () { #{{{
-	# Preprocess the shortcuts page to get all the available shortcuts
-	# defined before other pages are rendered.
-	my $srcfile=srcfile("shortcuts.mdwn", 1);
-	if (! defined $srcfile) {
-		error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+sub checkconfig () { #{{{
+	if (defined $config{srcdir}) {
+		# Preprocess the shortcuts page to get all the available shortcuts
+		# defined before other pages are rendered.
+		my $srcfile=srcfile("shortcuts.mdwn", 1);
+		if (! defined $srcfile) {
+			error(gettext("shortcut plugin will not work without a shortcuts.mdwn"));
+		}
+		IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 	}
-	IkiWiki::preprocess("shortcuts", "shortcuts", readfile($srcfile));
 } # }}}
 
 sub preprocess_shortcut (@) { #{{{
diff --git a/debian/changelog b/debian/changelog
index 299cf1af2..4547cda3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * Add support for checking pushes from untrusted git committers. This can be
     used to set up anonymous git pushes, and other similar things.
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
+  * shortcut: Fix display of shortcuts while previewing.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/bugs/cannot_preview_shortcuts.mdwn b/doc/bugs/cannot_preview_shortcuts.mdwn
index a2fd3533a..2e7ef13b7 100644
--- a/doc/bugs/cannot_preview_shortcuts.mdwn
+++ b/doc/bugs/cannot_preview_shortcuts.mdwn
@@ -1,2 +1,4 @@
 Shortcuts such as \[[!google foo]] do not work when previewing pages.
 --[[JasonBlevins]]
+
+> Broken during the setup dumping changes, now fixed. --[[Joey]] [[done]]
-- 
cgit v1.2.3


From 26e1fe20218f8072a807c24eb129ecd5948b7d06 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 29 Oct 2008 14:28:55 -0400
Subject: Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup
 bar`

The syslog value from the setup file is purposfully ignored when doing
ikiwiki -setup, so that it will output to stdout (while generating wrappers
that do use the syslog). But that caused -dumpsetup to not preserve
the syslog value from the setup file.
---
 debian/changelog | 1 +
 ikiwiki.in       | 1 +
 2 files changed, 2 insertions(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 4547cda3d..bee31b36e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     used to set up anonymous git pushes, and other similar things.
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
   * shortcut: Fix display of shortcuts while previewing.
+  * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/ikiwiki.in b/ikiwiki.in
index af5cabdc0..ca499b115 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -163,6 +163,7 @@ sub main () { #{{{
 
 	if ($config{dumpsetup}) {
 		$config{srdir}=$config{destdir}="";
+		$config{syslog}=1 if $config{setupsyslog};
 		require IkiWiki::Setup;
 		IkiWiki::Setup::dump($config{dumpsetup});
 	}
-- 
cgit v1.2.3


From 6d445cdacabc15e8966912fd2ce6794863d64b8a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 30 Oct 2008 14:59:37 -0400
Subject: fix --setup --render

In this mode, rebuild mode should not be on
---
 debian/changelog | 1 +
 ikiwiki.in       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index bee31b36e..0c3fded41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
   * shortcut: Fix display of shortcuts while previewing.
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
+  * Several fixes to --render mode.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/ikiwiki.in b/ikiwiki.in
index ca499b115..d2f5d48dc 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -156,7 +156,7 @@ sub main () { #{{{
 		}
 		
 		# setup implies a wiki rebuild by default
-		if (! $config{refresh}) {
+		if (! $config{refresh} && ! $config{render}) {
 			$config{rebuild}=1;
 		}
 	}
-- 
cgit v1.2.3


From bb841f94f47d865e4c78bd4f27c5f9cc04dc1557 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 31 Oct 2008 16:42:20 -0400
Subject: format: New plugin, allows embedding differntly formatted text inside
 a page (ie, otl inside a mdwn page, or syntax highlighted code inside a
 page).

---
 IkiWiki/Plugin/format.pm          | 29 +++++++++++++++++++++++++++++
 debian/changelog                  |  3 +++
 doc/ikiwiki/directive/format.mdwn | 21 +++++++++++++++++++++
 doc/plugins/format.mdwn           |  9 +++++++++
 doc/todo/syntax_highlighting.mdwn |  4 ++--
 po/bg.po                          | 29 +++++++++++++++++++----------
 po/cs.po                          | 29 +++++++++++++++++++----------
 po/da.po                          | 29 +++++++++++++++++++----------
 po/de.po                          | 29 +++++++++++++++++++----------
 po/es.po                          | 29 +++++++++++++++++++----------
 po/fr.po                          | 29 +++++++++++++++++++----------
 po/gu.po                          | 29 +++++++++++++++++++----------
 po/ikiwiki.pot                    | 13 +++++++++++--
 po/pl.po                          | 29 +++++++++++++++++++----------
 po/sv.po                          | 29 +++++++++++++++++++----------
 po/vi.po                          | 29 +++++++++++++++++++----------
 16 files changed, 265 insertions(+), 104 deletions(-)
 create mode 100644 IkiWiki/Plugin/format.pm
 create mode 100644 doc/ikiwiki/directive/format.mdwn
 create mode 100644 doc/plugins/format.mdwn

(limited to 'debian/changelog')

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
new file mode 100644
index 000000000..a219190e8
--- /dev/null
+++ b/IkiWiki/Plugin/format.pm
@@ -0,0 +1,29 @@
+#!/usr/bin/perl
+package IkiWiki::Plugin::format;
+
+use warnings;
+use strict;
+use IkiWiki 2.00;
+
+sub import { #{{{
+	hook(type => "preprocess", id => "format", call => \&preprocess);
+} #}}}
+
+sub preprocess (@) { #{{{
+	my $format=$_[0];
+	shift; shift;
+	my $text=$_[0];
+	shift; shift;
+	my %params=@_;
+
+	if (! defined $format || ! defined $text) {
+		error(gettext("must specify format and text"));
+	}
+	elsif (! exists $IkiWiki::hooks{htmlize}{$format}) {
+		error(sprintf(gettext("unsupported page format %s"), $format));
+	}
+
+	return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text);
+} #}}}
+
+1
diff --git a/debian/changelog b/debian/changelog
index 0c3fded41..ca0433d10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * shortcut: Fix display of shortcuts while previewing.
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
+  * format: New plugin, allows embedding differntly formatted text inside a
+    page (ie, otl inside a mdwn page, or syntax highlighted code inside a
+    page).
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn
new file mode 100644
index 000000000..94cf1b04f
--- /dev/null
+++ b/doc/ikiwiki/directive/format.mdwn
@@ -0,0 +1,21 @@
+The `format` directive is supplied by the [[!iki plugins/format desc=format]]
+plugin.
+
+The directive allows formatting a chunk of text using any available page
+format. It takes two parameters. First is the type of format to use,
+ie the extension that would be used for a standalone file of this type.
+Second is the text to format.
+
+For example, this will embed an otl outline inside a page using mdwn or
+some other format:
+
+	\[[!format otl """
+	foo
+		1
+		2
+	bar
+		3
+		4
+	"""]]
+
+[[!meta robots="noindex, follow"]]
diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn
new file mode 100644
index 000000000..91e707fcf
--- /dev/null
+++ b/doc/plugins/format.mdwn
@@ -0,0 +1,9 @@
+[[!template id=plugin name=format core=0 author="[[Joey]]"]]
+[[!tag type/format]]
+
+This plugin allows mixing different page formats together, by embedding
+text formatted one way inside a page formatted another way. This is done
+using the [[ikiwiki/directive/format]] [[ikiwiki/directive]].
+
+For example, it could be used to embed an [[otl]] outline inside a page
+that is formatted as [[mdwn]].
diff --git a/doc/todo/syntax_highlighting.mdwn b/doc/todo/syntax_highlighting.mdwn
index 43878437f..bb1c84f02 100644
--- a/doc/todo/syntax_highlighting.mdwn
+++ b/doc/todo/syntax_highlighting.mdwn
@@ -73,8 +73,8 @@ That would run the text through the pl htmlizer, from the syntax hightligh
 plugin. OTOH, if "rst" were given, it would run the text through the rst
 htmlizer. So, more generic, allows mixing different types of markup on one
 page, as well as syntax highlighting. Does require specifying the type of
-format, instead of allows it to be guessed (which some syntax highlighters
-can do).
+format, instead of allowing it to be guessed (which some syntax highlighters
+can do). (This directive is now implemented..)
 
 Hmm, this would also allow comments inside source files to have mdwn
 embedded in them, without making the use of mdwn a special case, or needing
diff --git a/po/bg.po b/po/bg.po
index 471e03119..19b0fff50 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -131,7 +131,7 @@ msgstr "създаване на нова страницa „%s”"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "готово"
 
@@ -253,22 +253,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "грешка при обработване на шаблона"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "грешшка в приставката „fortune”"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -686,11 +695,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "препратката няма указани параметрите „name” или „url”"
@@ -698,7 +707,7 @@ msgstr "препратката няма указани параметрите 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "препратката „%s” сочи към „%s”"
@@ -970,11 +979,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "генериране на обвивки..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "обновяване на уики..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "осъвременяване на уики..."
 
diff --git a/po/cs.po b/po/cs.po
index ece992c47..6cbb0c596 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -128,7 +128,7 @@ msgstr "vytvářím novou stránku %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "hotovo"
 
@@ -250,22 +250,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "nepodařilo se zpracovat:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune selhal"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -674,18 +683,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "chybí parametr jméno nebo url"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "zkratka %s odkazuje na <i>%s</i>"
@@ -951,11 +960,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "generuji obaly..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "znovu vytvářím wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "obnovuji wiki..."
 
diff --git a/po/da.po b/po/da.po
index 3d0deca8a..6c3ed3e53 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-22 19:13+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -132,7 +132,7 @@ msgstr "opretter ny side %s"
 msgid "deleting bucket.."
 msgstr "sletter bundt.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "færdig"
 
@@ -250,22 +250,31 @@ msgstr "redigeringsskabelon %s registreret for %s"
 msgid "failed to process"
 msgstr "dannelsen mislykkedes"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "revisionskontrolsystem %s ikke understøttet"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "spådom (fortune) fejlede"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "du er ikke logget på som en administrator"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "du er ikke logget på som en administrator"
@@ -669,18 +678,18 @@ msgstr "behøver Digest::SHA1 til indeks %s"
 msgid "search"
 msgstr "søg"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "genvejsudvidelsen vil ikke fungere uden en shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "manglende navn eller url parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvej %s viser til <i>%s</i>"
@@ -949,11 +958,11 @@ msgstr "brug: --set var=værdi"
 msgid "generating wrappers.."
 msgstr "bygger wrappers.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "genopbygger wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "genopfrisker wiki..."
 
diff --git a/po/de.po b/po/de.po
index bef54ad89..022fbfef1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-03-03 21:22+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "fertig"
 
@@ -247,22 +247,31 @@ msgstr "»edittemplate« %s registriert für %s"
 msgid "failed to process"
 msgstr "Bearbeitung fehlgeschlagen"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "»fortune« fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -671,18 +680,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "das »shortcut«-Plugin funktioniert nicht ohne eine »shortcuts.mdwn«"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "fehlender Name oder URL-Parameter"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Shortcut %s zeigt auf <i>%s</i>"
@@ -946,11 +955,11 @@ msgstr "Benutzung: --set Variable=Wert"
 msgid "generating wrappers.."
 msgstr "erzeuge Wrapper.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "erzeuge Wiki neu.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "aktualisiere Wiki.."
 
diff --git a/po/es.po b/po/es.po
index 7afb45c14..8dce2940f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-22 13:54+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -130,7 +130,7 @@ msgstr "creando nueva página %s"
 msgid "deleting bucket.."
 msgstr "borrando el directorio.."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "completado"
 
@@ -248,22 +248,31 @@ msgstr "plantilla de edición %s registrada para %s"
 msgid "failed to process"
 msgstr "fallo en el proceso"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "el sistema de control de versiones %s no está soportado"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "el programa fortune ha fallado"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "No está registrado como un administrador"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "No está registrado como un administrador"
@@ -676,18 +685,18 @@ msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
 msgid "search"
 msgstr "buscar"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "el complemento shortcut no funciona sin una página shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "El atajo %s apunta a <i>%s</i>"
@@ -959,11 +968,11 @@ msgstr "uso: --set variable=valor"
 msgid "generating wrappers.."
 msgstr "generando programas auxiliares.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "reconstruyendo el wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "actualizando el wiki.."
 
diff --git a/po/fr.po b/po/fr.po
index c0c96c476..53095c5e1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2008-10-11 10:34+0200\n"
 "Last-Translator: Julien Patriarca <patriarcaj@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -133,7 +133,7 @@ msgstr "Création de la nouvelle page %s"
 msgid "deleting bucket.."
 msgstr "suppression du compartiment (« bucket »)..."
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "Terminé"
 
@@ -255,22 +255,31 @@ msgstr "edittemplate %s enregistré pour %s"
 msgid "failed to process"
 msgstr "Échec du traitement"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, fuzzy, perl-format
+msgid "unsupported page format %s"
+msgstr "Système de contrôle de version non reconnu"
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "Échec du lancement de « fortune »"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, fuzzy, perl-format
 msgid "you are not allowed to change %s"
 msgstr "vous n'êtes pas authentifié comme administrateur"
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 #, fuzzy
 msgid "you are not allowed to change file modes"
 msgstr "vous n'êtes pas authentifié comme administrateur"
@@ -683,18 +692,18 @@ msgstr "Digest::SHA1 est nécessaire pour indexer %s"
 msgid "search"
 msgstr "recherche"
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr "Le greffon « shortcut » ne fonctionnera pas sans shortcuts.mdwn"
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "Il manque le paramètre nom ou URL."
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "Le raccourci %s pointe vers <i>%s</i>"
@@ -967,11 +976,11 @@ msgstr "Syntaxe : -- set var=valeur"
 msgid "generating wrappers.."
 msgstr "Création des fichiers CGI..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "Reconstruction du wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "Rafraîchissement du wiki..."
 
diff --git a/po/gu.po b/po/gu.po
index c48985eb5..13c68afc9 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -129,7 +129,7 @@ msgstr "નવું પાનું %s બનાવે છે"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "સંપૂર્ણ"
 
@@ -251,22 +251,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "ભવિષ્ય નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -675,18 +684,18 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 msgid "missing name or url parameter"
 msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ"
 
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દેશ કરે છે"
@@ -951,11 +960,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "આવરણ બનાવે છે.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "વીકી ફરીથી બનાવે છે.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "વીકીને તાજી કરે છે.."
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index ab28f956c..f3eb0eb55 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: 2008-10-29 17:42-0400\n"
+"POT-Creation-Date: 2008-10-31 16:38-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"
@@ -246,6 +246,15 @@ msgstr ""
 msgid "failed to process"
 msgstr ""
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr ""
@@ -671,7 +680,7 @@ msgstr ""
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:47
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 6f262a2be..6f582c71f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -133,7 +133,7 @@ msgstr "tworzenie nowej strony %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "gotowe"
 
@@ -255,22 +255,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "awaria w trakcie przetwarzania:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "awaria fortunki"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -691,11 +700,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "brakujący parametr name lub url"
@@ -703,7 +712,7 @@ msgstr "brakujący parametr name lub url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "skrót %s wskazuje na adres <i>%s</i>"
@@ -976,11 +985,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "tworzenie osłon..."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "przebudowywanie wiki..."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "odświeżanie wiki..."
 
diff --git a/po/sv.po b/po/sv.po
index cc83869cf..6d3e263ee 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -130,7 +130,7 @@ msgstr "skapar nya sidan %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "klar"
 
@@ -252,22 +252,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "misslyckades med att behandla mall:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune misslyckades"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -681,11 +690,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "genväg saknar parameter för namn eller url"
@@ -693,7 +702,7 @@ msgstr "genväg saknar parameter för namn eller url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "genvägen %s pekar på %s"
@@ -965,11 +974,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "genererar wrappers.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "bygger om wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "uppdaterar wiki.."
 
diff --git a/po/vi.po b/po/vi.po
index 13d695880..4cc16e1d8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 15:03-0400\n"
+"POT-Creation-Date: 2008-10-31 16:37-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -131,7 +131,7 @@ msgstr "đang tạo trang mới %s"
 msgid "deleting bucket.."
 msgstr ""
 
-#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205
+#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206
 msgid "done"
 msgstr "xong"
 
@@ -253,22 +253,31 @@ msgstr ""
 msgid "failed to process"
 msgstr "mẫu không xử lý được:"
 
+#: ../IkiWiki/Plugin/format.pm:22
+msgid "must specify format and text"
+msgstr ""
+
+#: ../IkiWiki/Plugin/format.pm:25
+#, perl-format
+msgid "unsupported page format %s"
+msgstr ""
+
 #: ../IkiWiki/Plugin/fortune.pm:27
 msgid "fortune failed"
 msgstr "fortune bị lỗi"
 
-#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635
+#: ../IkiWiki/Plugin/git.pm:618 ../IkiWiki/Plugin/git.pm:636
 #: ../IkiWiki/Receive.pm:129
 #, perl-format
 msgid "you are not allowed to change %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:657
+#: ../IkiWiki/Plugin/git.pm:658
 #, perl-format
 msgid "you cannot act on a file with mode %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/git.pm:661
+#: ../IkiWiki/Plugin/git.pm:662
 msgid "you are not allowed to change file modes"
 msgstr ""
 
@@ -682,11 +691,11 @@ msgstr ""
 msgid "search"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:27
+#: ../IkiWiki/Plugin/shortcut.pm:28
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
 msgstr ""
 
-#: ../IkiWiki/Plugin/shortcut.pm:36
+#: ../IkiWiki/Plugin/shortcut.pm:38
 #, fuzzy
 msgid "missing name or url parameter"
 msgstr "lối tắt thiếu tên hay tham số url"
@@ -694,7 +703,7 @@ msgstr "lối tắt thiếu tên hay tham số url"
 #. translators: This is used to display what shortcuts are defined.
 #. translators: First parameter is the name of the shortcut, the second
 #. translators: is an URL.
-#: ../IkiWiki/Plugin/shortcut.pm:45
+#: ../IkiWiki/Plugin/shortcut.pm:48
 #, fuzzy, perl-format
 msgid "shortcut %s points to <i>%s</i>"
 msgstr "lối tắt %s chỉ tới %s"
@@ -966,11 +975,11 @@ msgstr ""
 msgid "generating wrappers.."
 msgstr "đang tạo ra các bộ bao bọc.."
 
-#: ../ikiwiki.in:194
+#: ../ikiwiki.in:195
 msgid "rebuilding wiki.."
 msgstr "đang xây dựng lại wiki.."
 
-#: ../ikiwiki.in:197
+#: ../ikiwiki.in:198
 msgid "refreshing wiki.."
 msgstr "đang làm tươi wiki.."
 
-- 
cgit v1.2.3


From 163790a3f99c158fb8af585e0f09f2497fa41d36 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 31 Oct 2008 17:21:22 -0400
Subject: typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index ca0433d10..975eb983d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,7 +39,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low
   * shortcut: Fix display of shortcuts while previewing.
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
-  * format: New plugin, allows embedding differntly formatted text inside a
+  * format: New plugin, allows embedding differently formatted text inside a
     page (ie, otl inside a mdwn page, or syntax highlighted code inside a
     page).
 
-- 
cgit v1.2.3


From 936e016de99af36ea5518dc16af8f4927b2388ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 31 Oct 2008 17:22:55 -0400
Subject: reorg

---
 debian/changelog | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 975eb983d..38701b6db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,25 @@
 ikiwiki (2.68) UNRELEASED; urgency=low
 
+  * Add support for checking pushes from untrusted git committers. This can be
+    used to set up anonymous git pushes, and other similar things.
+  * format: New plugin, allows embedding differently formatted text inside a
+    page (ie, otl inside a mdwn page, or syntax highlighted code inside a
+    page).
+  * relativedate: New javascript-alicious plugin that makes all dates display
+    relative, in a very nice way, if I say so myself.
+  * Optimise the no-op post-commit hook, to speed up web edits by a fraction
+    of a second.
+  * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
+  * shortcut: Fix display of shortcuts while previewing.
+  * Plugins that used to override displaytime should instead override
+    formattime. displaytime will call that, and may wrap markup around the
+    formatted time.
   * Add an underlay for javascript, and add ikiwiki.js containing some utility
     code.
   * toggle: Stop embedding the full toggle code on each page using it, and
     move it to toggle.js in the javascript underlay.
-  * relativedate: New javascript-alicious plugin that makes all dates display
-    relative, in a very nice way, if I say so myself.
   * recentchanges: Make feed links point back to anchors on the recentchanges
     page. (JasonBlevins)
-  * Updated French translation. Closes: #502694
-  * Plugins that used to override displaytime should instead override
-    formattime. displaytime will call that, and may wrap markup around the
-    formatted time.
   * Fix issue with utf-8 in wikiname breaking session cookies, by
     entity-encoding the wikiname in the session cookie.
   * Use the pure perl Data::Dumper when generating setup files to ensure that
@@ -29,19 +37,11 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     (This is a scary thing that grubs through the symbol table, and replaces
     all exported occurances of a function with the injected version.)
   * external: RPC functions can be injected to replace exported functions.
+  * Updated French translation. Closes: #502694
   * Updated Spanish translation from the ever vigilant Victor Moral.
   * Updated Danish translation from Jonas Smedegaard. Closes: #503117
-  * Optimise the no-op post-commit hook, to speed up web edits by a fraction
-    of a second.
-  * Add support for checking pushes from untrusted git committers. This can be
-    used to set up anonymous git pushes, and other similar things.
-  * git: Allow [[sha1_commit]] to be used in the diffurl, to support cgit.
-  * shortcut: Fix display of shortcuts while previewing.
   * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar`
   * Several fixes to --render mode.
-  * format: New plugin, allows embedding differently formatted text inside a
-    page (ie, otl inside a mdwn page, or syntax highlighted code inside a
-    page).
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 
-- 
cgit v1.2.3