diff --git a/Makefile.PL b/Makefile.PL
index 397627c03..93f9e89e2 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -47,31 +47,10 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
 docwiki: ikiwiki.out
 	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
 
-underlaypo: ikiwiki.out
-	# copy all the files we want to translate into the
-	# po/underlays scrdir.
-	for file in `find underlays -follow -name \*.mdwn`; do \
-		install -d po/$$(dirname $$file); \
-		cp -aL $$file po/$$file 2>/dev/null || \
-		install -m 644 $$file po/$$file; \
-	done
-	install -d po/underlays/directives/ikiwiki/directive
-	for file in doc/ikiwiki/directive/*; do \
-		if [ -f "$$file" ]; then \
-			cp -a $$file po/underlays/directives/ikiwiki/directive ||  \
-			install -m 644 $$file po/underlays/directives/ikiwiki/directive; \
-		fi \
-	done
-	install -d po/underlays/empty
-	$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup underlaypo.setup -refresh
-	PERL5LIB=. po/po2wiki underlaypo.setup
-	find po/underlays -name \*.mdwn | xargs rm -f
-
 extra_clean:
 	rm -rf html doc/.ikiwiki
 	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
 	$(MAKE) -C po clean
-	rm -rf po/html po/underlays/.ikiwiki
 
 extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
diff --git a/debian/changelog b/debian/changelog
index a8d8c7e07..c0475d0dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ ikiwiki (3.15) UNRELEASED; urgency=low
   * rename: Refactor subpage rename handling code into rename hook. (intrigeri)
   * po: New plugin, suporting translation of wiki pages using po files.
     (intrigeri)
-  * Add underlaypo setup that can be used to generate po files for
-    translating the underlays.
+  * Add build machinery to build po files to translate the underlay wikis,
+  * Add further build machinery to generate translated underlays from
+    the po file, for use by wikis whose primary language is not English.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 02 Jun 2009 17:03:41 -0400
 
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 8e05606f5..8e87e2638 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -288,7 +288,8 @@ So, we seem to have two cases, in one po files from the underlay should be
 used, in the other not. Hmm. Support both?
 
 > Update -- I've written po2wiki, which can spit out translated underlays
-> in markdown format. 
+> in markdown format, and made the po plugin enable use of such underlays
+> when the master language is not `en`.
 --[[Joey]] 
 
 Duplicate %links ?
diff --git a/doc/translation.mdwn b/doc/translation.mdwn
index 22801d997..459f47eb5 100644
--- a/doc/translation.mdwn
+++ b/doc/translation.mdwn
@@ -27,8 +27,8 @@ essentially three pieces needed for a complete translation:
    wikis using po files and can be used for this.
 
    To generate the po and pot files for translating the basewiki,
-   get ikiwiki's source, and edit the `underlaypo.setup` file,
-   adding your language. Then run 'perl Makefile.PL; make underlaypo`.
+   get ikiwiki's source, edit the `po/underlay.setup` file,
+   adding your language. Then run 'make -C po underlays`.
    This will generate many po files under `po/underlays`. The first
    ones you'll want to translate are in the `po/underlays/basewiki` directory,
    which is really not very large, just a few thousand words.
diff --git a/po/Makefile b/po/Makefile
index c1c37443b..cef2ec879 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,7 +5,7 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \
 POFILES=$(wildcard *.po)
 MOFILES=$(POFILES:.po=.mo)
 
-all: ikiwiki.pot mo
+all: ikiwiki.pot mo ../underlays/locale
 
 mo: $(MOFILES)
 
@@ -23,7 +23,9 @@ ikiwiki.pot: $(POTFILES)
 	fi
 
 clean:
-	rm -f $(MOFILES) messages messages.mo
+	rm -f $(MOFILES) messages messages.mo *_stamp
+	rm -rf html underlays/.ikiwiki ../underlays/locale
+	find underlays -name \*.mdwn | xargs rm -f
 
 %.mo: %.po
 	msgfmt -o $@ $<
@@ -46,3 +48,28 @@ check:
 		printf "$$lang: "; \
 		msgfmt -o /dev/null -c -v --statistics $$lang.po;\
 	done
+
+underlays_copy_stamp:
+	# copy all the files we want to translate into a srcdir
+	for file in `cd ..; find underlays -follow -name \*.mdwn`; do \
+		install -d $$(dirname $$file); \
+		cp -aL ../$$file $$file 2>/dev/null || \
+		install -m 644 ../$$file $$file; \
+	done
+	install -d underlays/directives/ikiwiki/directive
+	for file in `cd ..; find doc/ikiwiki/directive/ -maxdepth 1 -type f`; do \
+		cp -a ../$$file underlays/directives/ikiwiki/directive ||  \
+		install -m 644 ../$$file underlays/directives/ikiwiki/directive; \
+	done
+	touch $@
+
+underlays: underlays_copy_stamp
+	install -d underlays/empty
+	../ikiwiki.out -libdir .. -setup underlay.setup -refresh
+
+../underlays/locale: po2wiki_stamp
+po2wiki_stamp: po2wiki underlays_copy_stamp
+	PERL5LIB=.. ./po2wiki underlay.setup
+	touch $@
+
+.PHONY: underlays
diff --git a/po/bg.po b/po/bg.po
index b972c0716..9c03e3b87 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -190,7 +190,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Дискусия"
@@ -578,99 +578,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "дискусия"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "обновяване на страницата „%s”"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "крешка при компилиране на файла %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "грешка при запис на файла „%s”: %s"
@@ -896,11 +896,11 @@ msgid "parse error"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+msgid "invalid featurepoint diameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+msgid "invalid featurepoint location"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -909,7 +909,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
 #, fuzzy
-msgid "bad height value"
+msgid "invalid height value"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -919,7 +919,7 @@ msgstr "липсващ параметър „id” на шаблона"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
 #, fuzzy
-msgid "bad width value"
+msgid "invalid width value"
 msgstr "приставката „linkmap”: грешка при изпълнение на „dot”"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1030,47 +1030,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "пропускане на невалидното име на файл „%s”"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "премахване на старата страница „%s”"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "сканиране на „%s”"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "обновяване на страницата „%s”, зависеща от „%s”"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "обновяване на „%s” и осъвременяване на обратните връзки"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "премахване на „%s” понеже не се генерира от „%s”"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: неуспех при обновяване на страницата „%s”"
diff --git a/po/cs.po b/po/cs.po
index 2e4508a34..b629e20a9 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -187,7 +187,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Diskuse"
@@ -568,99 +568,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client nebyl nalezen, nepinkám"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "diskuse"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "zpracovávám %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "nelze zkompilovat %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "nelze zapsat %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "nepodařilo se spustit dot"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "nelze číst %s: %s"
@@ -882,11 +882,13 @@ msgid "parse error"
 msgstr "chyba rozpoznávání"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "chybný průměr zvýrazněného bodu (featurepoint)"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "chybné umístění zvýrazněného bodu (featurepoint)"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -894,7 +896,8 @@ msgid "missing values"
 msgstr "chybí hodnoty"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "chybná výška"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -902,7 +905,8 @@ msgid "missing width parameter"
 msgstr "chybí parametr šířka (width)"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "chybná šířka"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1012,47 +1016,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "přeskakuji chybné jméno souboru %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "odstraňuji starou stránku %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "prohledávám %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "zpracovávám %s, která odkazuje na %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "zpracovávám %s, která závisí na %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "odstraňuji %s, již není zpracovávána %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: nelze zpracovat %s"
diff --git a/po/da.po b/po/da.po
index c8c3eedf9..5d28179d9 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\n"
 "PO-Revision-Date: 2009-05-28 14:58+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -193,7 +193,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Diskussion"
@@ -569,99 +569,99 @@ msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP ikke fundet, pinger ikke"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en fil"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "diskussion"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "danner %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Siden %s eksisterer ikke."
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "kompilering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "kompilering af %s mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "Ændring af størrelse mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "skrivning ad %s mislykkedes: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "dot-kørsel mislykkedes"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "læsning af %s mislykkedes: %s"
@@ -881,11 +881,13 @@ msgid "parse error"
 msgstr "afkodningsfejl"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "dårlig featurepoint-parameter diameter"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "dårlig featurepoint-parameter location"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -893,7 +895,8 @@ msgid "missing values"
 msgstr "manglende værdier"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "forkert højdeværdi"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -901,7 +904,8 @@ msgid "missing width parameter"
 msgstr "manglende breddeparameter"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "forkert breddeværdi"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1014,47 +1018,47 @@ msgstr ""
 "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir "
 "for at tillade dette"
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "udelader forkert filnavn %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s har flere mulige kildesider"
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "fjerner gammel side %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "gennemlæser %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "danner %s, som henviser til %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "danner %s, som afhænger af %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "fjerner %s, ikke længere dannet af %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: kan ikke danne %s"
diff --git a/po/de.po b/po/de.po
index 5082f05ed..fe8285888 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.06\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\n"
 "PO-Revision-Date: 2009-03-02 15:39+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -189,7 +189,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Diskussion"
@@ -570,99 +570,99 @@ msgstr "Ignoriere Ping-Direktiven für Wiki %s (dies ist Wiki %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP nicht gefunden, führe Ping nicht aus"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist keine Datei"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "erzeuge %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "Die Seite %s existiert nicht."
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "Erzeugen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Erzeugen von %s fehlgeschlagen"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "Größenänderung fehlgeschlagen: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "dot konnte nicht ausgeführt werden"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "Lesen von %s fehlgeschlagen: %s"
@@ -886,11 +886,13 @@ msgid "parse error"
 msgstr "Verarbeitungsfehler"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "fehlerhafter »featurepoint«-Durchmesser"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "fehlerhafter »featurepoint«-Ort"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -898,7 +900,8 @@ msgid "missing values"
 msgstr "fehlende Werte"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "fehlerhafte Höhenangaben"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -906,7 +909,8 @@ msgid "missing width parameter"
 msgstr "fehlender Breitenparameter"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "fehlerhafte Breitenangabe"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1019,47 +1023,47 @@ msgstr ""
 "Symbolischer Verweis im Quellverzeichnis (%s) gefunden -- setzen Sie "
 "allow_symlinks_before_srcdir, um dies zu erlauben"
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "überspringe fehlerhaften Dateinamen %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s hat mehrere mögliche Quellseiten"
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "entferne alte Seite %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "durchsuche %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "erzeuge %s, die auf %s verlinkt"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "erzeuge %s, die von %s abhängt"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "erzeuge %s, um dessen Rücklinks zu aktualisieren"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "entferne %s, wird nicht länger von %s erzeugt"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: kann %s nicht erzeugen"
diff --git a/po/es.po b/po/es.po
index ece0c4377..c9fad6a73 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\n"
 "PO-Revision-Date: 2009-06-14 12:32+0200\n"
 "Last-Translator: Victor Moral <victor@taquiones.net>\n"
 "Language-Team:  <en@li.org>\n"
@@ -195,7 +195,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Comentarios"
@@ -579,100 +579,100 @@ msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)"
 msgid "LWP not found, not pinging"
 msgstr "No he encontrado el componente LWP, no envío señal alguna"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no es un archivo"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 #, fuzzy
 msgid "discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "convirtiendo %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "No existe la página %s."
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "ha fallado la compilación del programa %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "dimensionamiento fallido: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "no puedo leer de %s: %s "
@@ -892,11 +892,13 @@ msgid "parse error"
 msgstr "error de análisis "
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "diámetro inválido "
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "localización errónea "
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -904,7 +906,8 @@ msgid "missing values"
 msgstr "faltan valores"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "valor incorrecto para la altura"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -912,7 +915,8 @@ msgid "missing width parameter"
 msgstr "falta el parámetro que indica el ancho"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "valor incorrecto para el ancho"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1027,49 +1031,49 @@ msgstr ""
 "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
 "la directiva allow_symlinks_before_srcdir para permitir la acción"
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ignorando el archivo %s porque su nombre no es correcto"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s tiene mútiples páginas fuente posibles"
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "eliminando la antigua página %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "explorando %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "convirtiendo la página %s, la cual referencia a %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "convirtiendo la página %s, la cual depende de %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 "convirtiendo la página %s para actualizar la lista de páginas que hacen "
 "referencia a ella."
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "eliminando la página %s puesto que ya no se deriva de %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: no puedo convertir la página %s"
diff --git a/po/fr.po b/po/fr.po
index 6cd8d3d98..66165de0a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 3.141\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\n"
 "PO-Revision-Date: 2009-06-29 16:42+0200\n"
 "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -191,7 +191,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Discussion"
@@ -571,99 +571,99 @@ msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)"
 msgid "LWP not found, not pinging"
 msgstr "LWP est introuvable. Pas de réponse au ping"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un fichier"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "Discussion"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "Reconstruction de %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, fuzzy, perl-format
 msgid "POT file (%s) does not exist"
 msgstr "La page %s n'existe pas."
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "Échec de la compilation de %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "Échec du redimensionnement : %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "Échec du lancement de dot"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "Échec de la lecture de %s : %s"
@@ -884,11 +884,13 @@ msgid "parse error"
 msgstr "Erreur d'analyse"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "Diamètre du point incorrect"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "Emplacement du point incorrect"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -896,7 +898,8 @@ msgid "missing values"
 msgstr "Il manque des valeurs"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "Hauteur incorrecte"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -904,7 +907,8 @@ msgid "missing width parameter"
 msgstr "Le paramètre largeur manque"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "Largeur incorrecte"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1018,47 +1022,47 @@ msgstr ""
 "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
 "activez le paramètre « allow_symlinks_before_srcdir »."
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr "%s peut être associé à plusieurs pages source."
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "Suppression de l'ancienne page %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "Examen de %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "Reconstruction de %s, qui est lié à %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "Reconstruction de %s, qui dépend de %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "Suppression de %s, qui n'est plus rendu par %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki : impossible de reconstruire %s"
diff --git a/po/gu.po b/po/gu.po
index 97392fc46..5bc897a90 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -188,7 +188,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "ચર્ચા"
@@ -568,99 +568,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "રેન્ડર કરે છે %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "%s લખવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "ડોટ ચલાવવામાં નિષ્ફળ"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "%s વાંચવામાં નિષ્ફળ: %s"
@@ -883,11 +883,13 @@ msgid "parse error"
 msgstr "ઉકેલવામાં ક્ષતિ"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "ખરાબ લાક્ષણિકબિંદુ વ્યાસ"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "ખરાબ લાક્ષણિકબિંદુ સ્થિતિ"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -895,7 +897,8 @@ msgid "missing values"
 msgstr "ખોવાયેલ કિંમતો"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+#, fuzzy
+msgid "invalid height value"
 msgstr "ખરાબ ઉંચાઇ કિંમત"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -903,7 +906,8 @@ msgid "missing width parameter"
 msgstr "ખોવાયેલ પહોળાઇ વિકલ્પ"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+#, fuzzy
+msgid "invalid width value"
 msgstr "ખરાબ પહોળાઇ કિંમત"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1012,47 +1016,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "જુનાં પાનાં દૂર કરે છે %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "%s શોધે છે"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 7a14f85fc..3451329cc 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: 2009-07-19 17:51+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -186,7 +186,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr ""
@@ -556,98 +556,98 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, perl-format
 msgid "failed to update %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, perl-format
 msgid "failed to translate %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, perl-format
 msgid "failed to write %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 msgid "failed to translate"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, perl-format
 msgid "failed to read %s"
 msgstr ""
@@ -867,11 +867,11 @@ msgid "parse error"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+msgid "invalid featurepoint diameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+msgid "invalid featurepoint location"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -879,7 +879,7 @@ msgid "missing values"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
-msgid "bad height value"
+msgid "invalid height value"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -887,7 +887,7 @@ msgid "missing width parameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
-msgid "bad width value"
+msgid "invalid width value"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -994,47 +994,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index e6544d5c2..afbcbe39e 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -192,7 +192,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Dyskusja"
@@ -581,99 +581,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, fuzzy, perl-format
 msgid "%s is not a valid language code"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "dyskusja"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "renderowanie %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "awaria w trakcie kompilowania %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "awaria w trakcie zapisu %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "awaria w trakcie uruchamiania dot"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "awaria w trakcie odczytu %s: %s"
@@ -901,11 +901,13 @@ msgid "parse error"
 msgstr "błąd w trakcie przetwarzania"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+#, fuzzy
+msgid "invalid featurepoint diameter"
 msgstr "nieprawidłowa średnica dla featurepoint"
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+#, fuzzy
+msgid "invalid featurepoint location"
 msgstr "nieprawidłowe położenie dla featurepoint"
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -914,7 +916,7 @@ msgstr "brakujące wartości"
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
 #, fuzzy
-msgid "bad height value"
+msgid "invalid height value"
 msgstr "nieprawidłowa wysokość"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -924,7 +926,7 @@ msgstr "brakujący parametr width"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
 #, fuzzy
-msgid "bad width value"
+msgid "invalid width value"
 msgstr "nieprawidłowa szerokość"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1036,47 +1038,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "pomijanie nieprawidłowej nazwy pliku %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "usuwanie starej strony %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "skanowanie %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "renderowanie %s z odnośnikiem do %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "renderowanie %s zależącego od %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "usuwanie %s nie tworzonego już przez %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: awaria w trakcie tworzenia %s"
diff --git a/po/po2wiki b/po/po2wiki
index 031c906cb..6b84f7d54 100755
--- a/po/po2wiki
+++ b/po/po2wiki
@@ -23,15 +23,19 @@ foreach my $file (@$files) {
 }
 
 foreach my $ll (keys %{$config{po_slave_languages}}) {
-	$config{destdir}="po/out.$ll";
+	$config{destdir}="../underlays/locale/$ll";
 
 	foreach my $file (@$files) {
 		my $page=pagename($file);
 		my ($masterpage, $lang) = IkiWiki::Plugin::po::_istranslation($page);
 		next unless defined $lang && $lang eq $ll;
 		
-		my $content=readfile(srcfile($file));
-		$content=IkiWiki::Plugin::po::po_to_markup($page, $content);
-		writefile($masterpage.".".$config{default_pageext}, $config{destdir}, $content);
+		my $content=IkiWiki::Plugin::po::po_to_markup($page, readfile(srcfile($file)));
+		# avoid wasting space if the page is not translated at all
+		my $mastercontent=readfile(srcfile($pagesources{$masterpage}));
+		if ($content ne $mastercontent) {
+			writefile($masterpage.".".$config{default_pageext},
+				$config{destdir}, $content);
+		}
 	}
 }
diff --git a/po/sv.po b/po/sv.po
index 9a1743afb..70d9ca68c 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -189,7 +189,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Diskussion"
@@ -574,99 +574,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "RPC::XML::Client hittades inte, pingar inte"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "diskussion"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "ritar upp %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "misslyckades med att kompilera %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap misslyckades att köra dot"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "misslyckades med att skriva %s: %s"
@@ -891,11 +891,11 @@ msgid "parse error"
 msgstr "linkmap misslyckades att köra dot"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+msgid "invalid featurepoint diameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+msgid "invalid featurepoint location"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -904,7 +904,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
 #, fuzzy
-msgid "bad height value"
+msgid "invalid height value"
 msgstr "linkmap misslyckades att köra dot"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -914,7 +914,7 @@ msgstr "mall saknar id-parameter"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
 #, fuzzy
-msgid "bad width value"
+msgid "invalid width value"
 msgstr "linkmap misslyckades att köra dot"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1025,47 +1025,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "tar bort gammal sida %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "söker av %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "ritar upp %s, vilken länkar till %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "ritar upp %s, vilken är beroende av %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "tar bort %s, som inte längre ritas upp av %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: kan inte rita upp %s"
diff --git a/underlaypo.setup b/po/underlay.setup
similarity index 81%
rename from underlaypo.setup
rename to po/underlay.setup
index cc8be38ea..ef2d1e161 100644
--- a/underlaypo.setup
+++ b/po/underlay.setup
@@ -9,19 +9,19 @@ use IkiWiki::Setup::Standard {
         po_slave_languages => {
 		#'fr' => 'Français',
 		#'es' => 'Español',
-		#'de' => 'Deutsch',
+		'de' => 'Deutsch',
         },
 	po_master_language => { 'code' => 'en', 'name' => 'English' },
 	po_translatable_pages => "*",
 	add_plugins => [qw{po}],
 
 	wikiname => "ikiwiki",
-	srcdir => "po/underlays",
-	destdir => "po/html",
+	srcdir => "underlays",
+	destdir => "html",
 	templatedir => "templates",
 	# we don't want to pull in the normal underlays
-	underlaydirbase => "po/underlays/empty",
-	underlaydir => "po/underlays/empty",
+	underlaydirbase => "underlays/empty",
+	underlaydir => "underlays/empty",
 	discussion => 0,
 	locale => '',
 	verbose => 1,
diff --git a/po/vi.po b/po/vi.po
index 2272610d0..75fceb445 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: 2009-07-19 16:45+0200\n"
+"POT-Creation-Date: 2009-07-20 06:45+0200\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"
@@ -190,7 +190,7 @@ msgstr ""
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233
 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365
 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37
-#: ../IkiWiki/Plugin/po.pm:271 ../IkiWiki/Plugin/po.pm:274
+#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286
 #: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150
 msgid "Discussion"
 msgstr "Thảo luận"
@@ -575,99 +575,99 @@ msgstr ""
 msgid "LWP not found, not pinging"
 msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping"
 
-#: ../IkiWiki/Plugin/po.pm:129
+#: ../IkiWiki/Plugin/po.pm:130
 msgid ""
 "At least one slave language must be defined in po_slave_languages when using "
 "the po plugin"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:134
+#: ../IkiWiki/Plugin/po.pm:136
 #, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:145
+#: ../IkiWiki/Plugin/po.pm:148
 #, perl-format
 msgid ""
 "%s is not a valid value for po_link_to, falling back to po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:150
+#: ../IkiWiki/Plugin/po.pm:153
 msgid ""
 "po_link_to=negotiated requires usedirs to be enabled, falling back to "
 "po_link_to=default"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:264
+#: ../IkiWiki/Plugin/po.pm:276
 msgid "discussion"
 msgstr "thảo luận"
 
-#: ../IkiWiki/Plugin/po.pm:361
+#: ../IkiWiki/Plugin/po.pm:373
 #, perl-format
 msgid "re-rendering all pages to fix meta titles"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:365 ../IkiWiki/Render.pm:406
+#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s"
 msgstr "đang vẽ %s"
 
-#: ../IkiWiki/Plugin/po.pm:398
+#: ../IkiWiki/Plugin/po.pm:410
 msgid "updated PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:422
+#: ../IkiWiki/Plugin/po.pm:434
 msgid ""
 "Can not remove a translation. Removing the master page, though, removes its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:442
+#: ../IkiWiki/Plugin/po.pm:454
 msgid ""
 "Can not rename a translation. Renaming the master page, though, renames its "
 "translations as well."
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:804
+#: ../IkiWiki/Plugin/po.pm:816
 #, perl-format
 msgid "POT file (%s) does not exist"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:812
+#: ../IkiWiki/Plugin/po.pm:824
 #, fuzzy, perl-format
 msgid "failed to update %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:818
+#: ../IkiWiki/Plugin/po.pm:830
 #, fuzzy, perl-format
 msgid "failed to copy the POT file to %s"
 msgstr "lỗi biên dịch %s"
 
-#: ../IkiWiki/Plugin/po.pm:854
+#: ../IkiWiki/Plugin/po.pm:866
 msgid "N/A"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:867
+#: ../IkiWiki/Plugin/po.pm:879
 #, fuzzy, perl-format
 msgid "failed to translate %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:943
+#: ../IkiWiki/Plugin/po.pm:955
 msgid "removed obsolete PO files"
 msgstr ""
 
-#: ../IkiWiki/Plugin/po.pm:1006 ../IkiWiki/Plugin/po.pm:1020
-#: ../IkiWiki/Plugin/po.pm:1060
+#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032
+#: ../IkiWiki/Plugin/po.pm:1072
 #, fuzzy, perl-format
 msgid "failed to write %s"
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/po.pm:1018
+#: ../IkiWiki/Plugin/po.pm:1030
 #, fuzzy
 msgid "failed to translate"
 msgstr "linkmap không chạy dot được"
 
-#: ../IkiWiki/Plugin/po.pm:1023
+#: ../IkiWiki/Plugin/po.pm:1035
 #, fuzzy, perl-format
 msgid "failed to read %s"
 msgstr "lỗi ghi %s: %s"
@@ -892,11 +892,11 @@ msgid "parse error"
 msgstr "linkmap không chạy dot được"
 
 #: ../IkiWiki/Plugin/sparkline.pm:78
-msgid "bad featurepoint diameter"
+msgid "invalid featurepoint diameter"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:88
-msgid "bad featurepoint location"
+msgid "invalid featurepoint location"
 msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:99
@@ -905,7 +905,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/sparkline.pm:104
 #, fuzzy
-msgid "bad height value"
+msgid "invalid height value"
 msgstr "linkmap không chạy dot được"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
@@ -915,7 +915,7 @@ msgstr "mẫu thiếu tham số id"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
 #, fuzzy
-msgid "bad width value"
+msgid "invalid width value"
 msgstr "linkmap không chạy dot được"
 
 #: ../IkiWiki/Plugin/sparkline.pm:153
@@ -1026,47 +1026,47 @@ msgid ""
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "đang bỏ qua tên tập tin sai %s"
 
-#: ../IkiWiki/Render.pm:285
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:361
+#: ../IkiWiki/Render.pm:370
 #, perl-format
 msgid "removing old page %s"
 msgstr "đang gỡ bỏ trang cũ %s"
 
-#: ../IkiWiki/Render.pm:401
+#: ../IkiWiki/Render.pm:410
 #, perl-format
 msgid "scanning %s"
 msgstr "đang quét %s"
 
-#: ../IkiWiki/Render.pm:427
+#: ../IkiWiki/Render.pm:436
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr "đang vẽ %s mà liên kết tới %s"
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:457
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr "đang vẽ %s mà phụ thuộc vào %s"
 
-#: ../IkiWiki/Render.pm:487
+#: ../IkiWiki/Render.pm:496
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó"
 
-#: ../IkiWiki/Render.pm:499
+#: ../IkiWiki/Render.pm:508
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s"
 
-#: ../IkiWiki/Render.pm:523
+#: ../IkiWiki/Render.pm:532
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr "ikiwiki: không thể vẽ %s"