Merge commit 'origin/master' into prv/po

IkiWiki.pm

@@ -920,6 +920,23 @@ 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);
+	}
+} #}}}
+
+sub formattime ($;$) { #{{{
+	# Plugins can override this function to mark up the time for
+	# display.
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {

IkiWiki/CGI.pm

@@ -278,9 +278,9 @@ sub check_banned ($$) { #{{{
 sub cgi_getsession ($) { #{{{
 	my $q=shift;
 
-	eval q{use CGI::Session};
+	eval q{use CGI::Session; use HTML::Entities};
 	error($@) if $@;
-	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
+	CGI::Session->name("ikiwiki_session_".encode_entities($config{wikiname}));
 	
 	my $oldmask=umask(077);
 	my $session = eval {

IkiWiki/Plugin/aggregate.pm

@@ -460,7 +460,7 @@ sub aggregate (@) { #{{{
 	foreach my $feed (@_) {
 		$feed->{lastupdate}=time;
 		$feed->{newposts}=0;
-		$feed->{message}=sprintf(gettext("processed ok at %s"),
+		$feed->{message}=sprintf(gettext("last checked %s"),
 			displaytime($feed->{lastupdate}));
 		$feed->{error}=0;
 

IkiWiki/Plugin/attachment.pm

@@ -280,7 +280,6 @@ sub attachment_list ($) { #{{{
 				link => htmllink($page, $page, $f, noimageinline => 1),
 				size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]),
 				mtime => displaytime($IkiWiki::pagemtime{$f}),
-				mtime_raw => $IkiWiki::pagemtime{$f},
 			};
 		}
 	}

IkiWiki/Plugin/ddate.pm

@@ -17,7 +17,7 @@ sub getsetup { #{{{
 		},
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {

IkiWiki/Plugin/inline.pm

@@ -316,9 +316,7 @@ sub preprocess_inline (@) { #{{{
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
-				$template->param(ctime_raw => scalar localtime($pagectime{$page}));
 				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
-				$template->param(mtime_raw => scalar localtime($pagemtime{$page}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
 	

IkiWiki/Plugin/prettydate.pm

@@ -84,7 +84,7 @@ sub checkconfig () { #{{{
 	}
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{
 	my $time=shift;
 	my $format=shift;
 	if (! defined $format) {

IkiWiki/Plugin/recentchanges.pm

@@ -173,7 +173,6 @@ sub store ($$$) { #{{{
 	$template->param(
 		%$change,
 		commitdate => displaytime($change->{when}, "%X %x"),
-		commitdate_raw => scalar localtime($change->{when}),
 		wikiname => $config{wikiname},
 	);
 	

IkiWiki/Plugin/relativedate.pm

@@ -2,13 +2,17 @@
 package IkiWiki::Plugin::relativedate;
 
 use warnings;
+no warnings 'redefine';
 use strict;
 use IkiWiki 2.00;
+use POSIX;
+use Encode;
 
 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);
 } # }}}
 
 sub getsetup () { #{{{
@@ -39,4 +43,18 @@ sub include_javascript ($;$) { #{{{
 		'" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
+sub display ($;$) { #{{{
+	my $time=shift;
+	my $format=shift;
+
+	# This needs to be in a form that can be parsed by javascript.
+	# Being fairly human readable is also nice, as it will be exposed
+	# as the title if javascript is not available.
+	my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
+			localtime($time)));
+
+	return '<span class="date" title="'.$gmtime.'">'.
+		IkiWiki::formattime($time, $format).'</span>';
+} #}}}
+
 1

IkiWiki/Render.pm

@@ -109,9 +109,7 @@ sub genpage ($$) { #{{{
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		mtime_raw => scalar localtime($pagemtime{$page}),
 		ctime => displaytime($pagectime{$page}),
-		ctime_raw => scalar localtime($pagectime{$page}),
 		baseurl => baseurl($page),
 	);
 

IkiWiki/Setup/Standard.pm

@@ -26,6 +26,8 @@ sub dumpline ($$$$) { #{{{
 	local $Data::Dumper::Pad="\t";
 	local $Data::Dumper::Sortkeys=1;
 	local $Data::Dumper::Quotekeys=0;
+	# only the perl version preserves utf-8 in output
+	local $Data::Dumper::Useperl=1;
 	
 	my $dumpedvalue;
 	if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {

Makefile.PL

@@ -54,6 +54,7 @@ extra_install:
 	for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
 		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
 		for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
+			cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir || \
 			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
 		done; \
 	done

debian/changelog

@@ -8,6 +8,15 @@ ikiwiki (2.68) UNRELEASED; urgency=low
     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
+    utf-8 characters are written out as such, and not as the encoded perl
+    strings the C Data::Dumper produces.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 17 Oct 2008 20:11:02 -0400
 

doc/bugs/recentchanges_feed_links.mdwn

@@ -98,3 +98,10 @@ to turn on? --Chapman Flack
 >>>>>> --[[JasonBlevins]], 2008-10-17
 
 [[JasonBlevins]] nailed it, [[done]] --[[Joey]]
+
+> Thanks for applying the patch (and improving it).  There's still one small issue:
+> the old opening div tag still needs to be removed (it's hard to see the removed line
+> with the pastie color scheme).
+> --[[JasonBlevins]], 2008-10-18
+
+>> Thanks, missed that when I had to hand-apply the patch. --[[Joey]]

doc/bugs/relative_date_weird_results.mdwn

@@ -0,0 +1,4 @@
+I just submitted a new bug, and... after clicking "save", my brand new bug page displays, at the bottom: "Last edited 6 hours and 3 minutes ago". Timezone issue, I guess? (Hint: I'm in France) -- [[intrigeri]]
+
+> Yep, it wasn't including a timezone in the machine parseable time.
+> [[done]] --[[Joey]]

doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn

@@ -0,0 +1,16 @@
+I spent hours trying to understand why my wiki suddenly refused me to log in (using passwordauth).
+The failure message was always: `login failed, perhaps you need to turn on cookies?`
+
+Inspecting the cookie information (thanks to Iceweasel's webdeveloper add-on), I realized there were some weird-looking encoded chars in the cookie name.
+
+Replacing "·" with "-" in `wikiname` fixed this login issue.
+
+> Hmm, Recai sent me a patch a long time ago to handle utf-8 here by encoding
+> the wikiname. But it doesn't seem to work, somehow the encoded utf-8
+> value still doesn't make it through. (CGI::Session seems to have underermined utf-8
+> issues too.) Seems like I will have to possibly break some sessions and
+> entity-encode the wikiname in the cookie.. [[done]]. --[[Joey]]
+
+(BTW, such a char was replaced by -I don't remember what encoding thingie- in my setup file, when running `ikiwiki-transition setupformat`.)
+
+> Thanks for the heads up, fixed that too. --[[Joey]]

doc/plugins/relativedate.mdwn

@@ -1,4 +1,4 @@
-[[!template id=plugin name=prettydate author="[[Joey]]"]]
+[[!template id=plugin name=relativedate author="[[Joey]]"]]
 [[!tag type/date]]
 
 This plugin lets dates be displayed in relative form. Examples: "2 days ago", 

doc/plugins/write.mdwn

@@ -196,7 +196,6 @@ generating the page.
 
 	hook(type => "pagetemplate", id => "foo", call => \&pagetemplate);
 
-
 [[Templates|wikitemplates]] are filled out for many different things in
 ikiwiki, like generating a page, or part of a blog page, or an rss feed, or
 a cgi. This hook allows modifying the variables available on those
@@ -361,6 +360,13 @@ This hook is called whenever ikiwiki normally saves its state, just before
 the state is saved. The function can save other state, modify values before
 they're saved, etc.
 
+### displaytime
+
+	hook(type => "displaytime", id => "foo", call => \&display);
+
+This hook can be registered to override the regular `displaytime` function.
+Only the last displaytime hook will be used.
+
 ### renamepage
 
 	hook(type => "renamepage", id => "foo", call => \&renamepage);

doc/tips/Git_repository_and_web_server_on_different_hosts.mdwn

@@ -0,0 +1,61 @@
+One may want to provide ikiwiki hosting with [[rcs/git]]+ssh access and web
+server located at different hosts. Here's a description for such
+a setup, using password-less SSH as a way of communication between
+these two hosts.
+
+Git server
+==========
+
+Let's create a user called `ikiwiki_example`. This user gets SSH
+access restricted to GIT pull/push, using `git-shell` as a shell.
+
+The root (bare) repository:
+
+- is stored in `~ikiwki_example/ikiwiki_example.git`
+- is owned by `ikiwiki_example:ikiwiki_example`
+- has permissions 0700
+
+The master repository's post-update hook connects via SSH to
+`webserver` as user `ikiwiki_example`, in order to run
+`~/bin/ikiwiki.update` on `webserver`; this post-update hook, located
+in `~ikiwki_example/ikiwiki_example.git/hooks/post-update`, is
+executable and contains:
+
+	#!/bin/sh
+	/usr/bin/ssh ikiwiki_example@webserver bin/ikiwiki.update
+
+Password-less SSH must be setup to make this possible; one can
+restrict `gitserver:ikiwiki_example` to be able to run only the needed
+command on the web server, using such a line in
+`webserver:~ikiwiki_example/.ssh/authorized_keys`:
+
+	command="bin/ikiwiki.update",from="gitserver.example.com",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa ...
+
+Web server
+==========
+
+Let's create a user called `ikiwiki_example` on `webserver`. She needs
+to have write permission to the destination directory.
+
+The working tree repository (`srcdir`):
+
+- is stored in `~ikiwki_example/src`
+- is owned by `ikiwiki_example:ikiwiki_example`
+- has permissions 0700
+- has the following origin: `ikiwiki_example@gitserver:ikiwiki_example.git`
+
+The CGI wrapper is generated with ownership set to
+`ikiwiki_example:ikiwiki_example` and permissions `06755`.
+
+Password-less SSH must be setup so that `ikiwiki_example@webserver` is
+allowed to push to the master repository. As told earlier, SSH access
+to `ikiwiki_example@gitserver` is restricted to GIT pull/push, which
+is just what we need.
+
+The Git wrapper is generated in `~ikiwiki_example/bin/ikiwiki.update`:
+
+	git_wrapper => '/home/ikiwiki_example/bin/ikiwiki.update'
+
+As previously explained, this wrapper is run over SSH by the master
+repository's post-update hook; it pulls updates from the master
+repository and triggers a wiki refresh.

doc/tips/laptop_wiki_with_git/discussion.mdwn

@@ -5,3 +5,8 @@ Or, was this last remark about rebuilding after pulling meant to apply to rebuil
 [[DavidBremner]]
 
 * *Updated*  Now that I play with this a bit, this seems not so important.  Having a seperate sync operation that I run from the laptop is no big deal, and lets me update the parts of my site not yet managed by ikiwiki at the same time.
+
+* Ok, I have finally finished to set this up. I have a question for you :) Is it mandatory to have a locally running webserver on the laptop ? I mean, do I need to setup the CGI wrapper on the laptop ? Is it possible to just add/edit/delete/whatever, git commit all the stuff and git push back to the server ? Thank you. --[[xma]]
+
+> Of course you don't need a web server on the laptop. It is useful for
+> previewing pages before publishing them though. --[[Joey]]

doc/todo/clear_page_to_delete.mdwn

@@ -14,3 +14,13 @@ question is really:
 
 Re vandalism in general, I am generally happy using git-revert to kill the
 offending change. --[[Joey]]
+
+I don't think we need a second way to delete pages, which would probably be
+used by the only few people who will learn it's possible by random
+documentation reading, find it useful, *and* remember it. -- [[intrigeri]]
+
+On the other hand, clearing the page's whole content essentially means deleting
+the page.  That's what the user intended to do in this case.  The information
+content of an empty vs. a deleted page is essentially the same, I'd say.  But
+having ikiwiki remove those stale pages would save some (minimal, admittedly)
+time needed for manual clean-up.  --[[tschwinge]]

doc/todo/httpauth_feature_parity_with_passwordauth.mdwn

@@ -0,0 +1,11 @@
+The only way to have a private ikiwiki, with a shared user database for static pages and CGI authentication, is to use [[plugins/httpauth]]. It would be good for httpauth to be on par with [[plugins/passwordauth]],
+i.e. to allow registering users, resetting passwords, and changing passwords; supporting some kind of
+`account_creation_password` configuration option would be nice, too.
+
+I'll probably propose patches implementing this at some point.
+I've not had a single look at the code yet, but it may be nice to factorize
+the relevant passwordauth code, instead of rewriting it completely in httpauth.
+
+-- [[intrigeri]]
+
+[[wishlist]]

doc/users/jasonblevins.mdwn

@@ -1,3 +1,5 @@
+[[!meta title="Jason Blevins"]]
+
 I'm currently hosting a private ikiwiki for keeping research notes
 which, with some patches and a (currently unreleased) plugin, will
 convert inline LaTeX expressions to MathML.  I'm working towards a
@@ -9,3 +11,12 @@ we're at it, why not SVG).
 
 My (also MathML-enabled) homepage: <http://jblevins.org/> (still using
 Blosxom...maybe one day I'll convert it to ikiwiki...)
+
+Current issues of interest:
+
+ * [[bugs/recentchanges_feed_links]]
+ * [[bugs/HTML_inlined_into_Atom_not_necessarily_well-formed]]
+ * [[plugins/toc/discussion]]
+ * [[todo/BibTeX]]
+ * [[todo/svg]]
+ * [[todo/Option_to_make_title_an_h1?]]

doc/users/joshtriplett.mdwn

@@ -1,10 +1,15 @@
 [[!meta title="Josh Triplett"]]
 
-Josh Triplett; `josh@{freedesktop.org,kernel.org,psas.pdx.edu}`.
+Email: `josh@{joshtriplett.org,freedesktop.org,kernel.org,psas.pdx.edu}`.
+
+[Josh Triplett's homepage](http://joshtriplett.org)
 
 Proud user of ikiwiki.
 
-Currently working on scripts to convert MoinMoin and TWiki wikis to ikiwikis
+Currently working on scripts to convert MoinMoin and TWiki wikis to
-backed by a git repository, including full history.
+ikiwikis backed by a git repository, including full history.
+Available from the following repositories, though not well-documented:
 
-> I've written about how I converted from Mediawiki here: <http://iki.u32.net/Mediawiki_Conversion/>  Are you ever going to release your scripts?  --[[sabr]]
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/moin2iki
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/html-wikiconverter
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/twiki

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-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Грешка"
 
@@ -90,8 +90,8 @@ msgstr "премахване на „%s”"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "е обработен нормално от %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -154,20 +154,20 @@ msgstr "Грешка при изпращане на поща"
 msgid "Failed to delete file from S3: "
 msgstr "грешка при запис на файла „%s”: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -964,12 +964,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -993,6 +993,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "е обработен нормално от %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Паролата ви е изпратена по пощата."
 

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Chyba"
 
@@ -88,8 +88,8 @@ msgstr "expiruji %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "zpracováno ok %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "Nepodařilo se odeslat email."
 msgid "Failed to delete file from S3: "
 msgstr "nelze změnit velikost: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -943,12 +943,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, 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:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -972,6 +972,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "zpracováno ok %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Vaše heslo vám bylo zasláno."
 

po/da.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-08-11 01:04+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -51,7 +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:1173
 msgid "Error"
 msgstr "Fejl"
 
@@ -92,8 +92,8 @@ msgstr "udløber %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "korrekt dannet ved %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -153,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"
 
@@ -935,12 +935,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, 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:1665
 msgid "yes"
 msgstr "ja"
 
@@ -963,3 +963,6 @@ msgstr ""
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
 msgstr ""
+
+#~ msgid "processed ok at %s"
+#~ msgstr "korrekt dannet ved %s"

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-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Fehler"
 
@@ -88,8 +88,8 @@ msgstr "%s läuft aus"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "normal verarbeitet um %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "Es konnte keine E-Mail versandt werden"
 msgid "Failed to delete file from S3: "
 msgstr "konnte kein Bild aus dem Code erzeugen"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -940,12 +940,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, 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:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -969,6 +969,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "normal verarbeitet um %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Ihr Passwort wurde Ihnen via E-Mail zugesandt."
 

po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
 "PO-Revision-Date: 2008-10-07 12:44+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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Error"
 
@@ -90,8 +90,8 @@ msgstr "%s caducada"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "proceso completado con éxito a %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -151,20 +151,20 @@ msgstr "No puedo guardar el archivo en S3: "
 msgid "Failed to delete file from S3: "
 msgstr "No puedo borrar archivo en S3: "
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "ya existe una página de nombre %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
@@ -948,14 +948,14 @@ msgstr "no puedo emplear varios complementos rcs"
 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:1149
+#: ../IkiWiki.pm:1156
 #, 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:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr "si"
 
@@ -981,6 +981,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr "¿ Cuál es el dominio para el servidor web ?"
 
+#~ msgid "processed ok at %s"
+#~ msgstr "proceso completado con éxito a %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Se le ha enviado su contraseña por correo electrónico."
 

po/fr.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-0400\n"
-"PO-Revision-Date: 2008-09-23 10:00+0100\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"
 "MIME-Version: 1.0\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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Erreur"
 
@@ -92,8 +92,8 @@ msgstr "Fin de validité de %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "A été correctement traité à %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -129,8 +129,9 @@ msgid "creating new page %s"
 msgstr "Création de la nouvelle page %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:31
+#, fuzzy
 msgid "deleting bucket.."
-msgstr "vidage du panier..."
+msgstr "suppression du compartiment (« bucket »)..."
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199
 msgid "done"
@@ -142,31 +143,35 @@ msgid "Must specify %s"
 msgstr "Vous devez spécifier %s"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:136
+#, fuzzy
 msgid "Failed to create bucket in S3: "
-msgstr "Echec lors de la création du panier en S3:"
+msgstr "Échec lors de la création du compartiment sur S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:221
+#, fuzzy
 msgid "Failed to save file to S3: "
-msgstr "Echec lors de la création du fichier en S3:"
+msgstr "Échec lors de la création du fichier sur S3 :"
 
 #: ../IkiWiki/Plugin/amazon_s3.pm:243
+#, fuzzy
 msgid "Failed to delete file from S3: "
-msgstr "Echec lors de la suppression du fichier de S3:"
+msgstr "Échec lors de la suppression du fichier sur S3 :"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr "il existe déjà une page nommée %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
+#, fuzzy
 msgid "prohibited by allowed_attachments"
-msgstr "action interdite par pièces jointes autorisées"
+msgstr "action interdite par allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr "Mauvais nom de la pièce jointe"
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr "envoi de la pièce jointe"
 
@@ -209,7 +214,7 @@ msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s"
 #: ../IkiWiki/Plugin/editpage.pm:40
 #, fuzzy, perl-format
 msgid "removing old preview %s"
-msgstr "Suppression de l'ancienne page %s"
+msgstr "Suppression de l'ancienne prévisualisation %s"
 
 #: ../IkiWiki/Plugin/editpage.pm:141
 #, perl-format
@@ -252,7 +257,7 @@ msgstr "Échec du lancement de « fortune »"
 #: ../IkiWiki/Plugin/google.pm:27
 #, fuzzy, perl-format
 msgid "Must specify %s when using the google search plugin"
-msgstr "Vous devez indiquer %s lors de l'utilisation du greffon de recherche"
+msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »."
 
 #: ../IkiWiki/Plugin/google.pm:31
 msgid "Failed to parse url, cannot determine domain name"
@@ -304,11 +309,12 @@ msgstr ""
 #: ../IkiWiki/Plugin/inline.pm:139
 #, fuzzy
 msgid "page editing not allowed"
-msgstr "Redirection cyclique non autorisée"
+msgstr "Modification de page interdite"
 
 #: ../IkiWiki/Plugin/inline.pm:156
+#, fuzzy
 msgid "missing pages parameter"
-msgstr "paramètres de la page manquants"
+msgstr "paramètre « pages » manquant"
 
 #: ../IkiWiki/Plugin/inline.pm:204
 #, perl-format
@@ -339,7 +345,7 @@ msgstr "Échec du lancement de dot"
 #: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
 #, perl-format
 msgid "%s is locked and cannot be edited"
-msgstr "%s est verouillé et ne peut être édité"
+msgstr "%s est verrouillé et ne peut être modifié"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
@@ -407,8 +413,8 @@ msgstr "Erreur lors de la création du compte."
 #: ../IkiWiki/Plugin/passwordauth.pm:257
 msgid "No email address, so cannot email password reset instructions."
 msgstr ""
-"Pas d'adresse email spécifiée. Impossible d'envoyer les instructions de "
+"Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour "
-"remise à zéro du mot de passe"
+"réinitialiser le mot de passe."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:291
 msgid "Failed to send mail"
@@ -417,16 +423,16 @@ msgstr "Échec de l'envoi du courriel"
 #: ../IkiWiki/Plugin/passwordauth.pm:293
 msgid "You have been mailed password reset instructions."
 msgstr ""
-"Vous avez reçu un message contenant les instructions de remise à zéro du mot "
+"Vous avez reçu un message contenant les instructions pour réinitialiser le "
-"de passe"
+"mot de passe"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:328
 msgid "incorrect password reset url"
-msgstr "Adresse de remise à zéro du mot de passe incorrecte"
+msgstr "Adresse pour la réinitialisation du mot de passe incorrecte"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:331
 msgid "password reset denied"
-msgstr "remise à zéro du mot de passe refusée"
+msgstr "réinitialisation du mot de passe refusée"
 
 #: ../IkiWiki/Plugin/pingee.pm:30
 msgid "Ping received."
@@ -464,7 +470,7 @@ msgstr "polygen n'est pas installé"
 
 #: ../IkiWiki/Plugin/polygen.pm:60
 msgid "command failed"
-msgstr "Echec lors du lancement de la commande"
+msgstr "Échec lors du lancement de la commande"
 
 #: ../IkiWiki/Plugin/postsparkline.pm:41
 msgid "missing formula"
@@ -541,11 +547,13 @@ msgstr "%A, à midi"
 #: ../IkiWiki/Plugin/progress.pm:34
 #, fuzzy, perl-format
 msgid "illegal percent value %s"
-msgstr "appellation non autorisé"
+msgstr "pourcentage %s illégal"
 
 #: ../IkiWiki/Plugin/progress.pm:59
+#, fuzzy
 msgid "need either `percent` or `totalpages` and `donepages` parameters"
 msgstr ""
+"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire."
 
 #: ../IkiWiki/Plugin/recentchanges.pm:100
 msgid "missing page"
@@ -618,8 +626,9 @@ msgid "rename %s"
 msgstr "%s renommé"
 
 #: ../IkiWiki/Plugin/rename.pm:138
+#, fuzzy
 msgid "Also rename SubPages and attachments"
-msgstr ""
+msgstr "« SubPages » et attachements renommés."
 
 #: ../IkiWiki/Plugin/rename.pm:224
 msgid "Only one attachment can be renamed at a time."
@@ -642,7 +651,7 @@ msgstr "du nouveau nom de %s en %s"
 #: ../IkiWiki/Plugin/search.pm:36
 #, perl-format
 msgid "Must specify %s when using the search plugin"
-msgstr "Vous devez indiquer %s lors de l'utilisation du greffon de recherche"
+msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »."
 
 #: ../IkiWiki/Plugin/search.pm:182
 #, perl-format
@@ -655,8 +664,7 @@ msgstr "recherche"
 
 #: ../IkiWiki/Plugin/shortcut.pm:27
 msgid "shortcut plugin will not work without a shortcuts.mdwn"
-msgstr ""
+msgstr "Le greffon « shortcut » ne fonctionnera pas sans shortcuts.mdwn"
-"Le greffon de raccourci (« shortcut ») ne fonctionnera pas sans shortcuts.mdwn"
 
 #: ../IkiWiki/Plugin/shortcut.pm:36
 msgid "missing name or url parameter"
@@ -696,7 +704,7 @@ msgstr "Hauteur incorrecte"
 
 #: ../IkiWiki/Plugin/sparkline.pm:111
 msgid "missing width parameter"
-msgstr "Le paramètre de largeur manque dans le modèle (« template »)"
+msgstr "Le paramètre largeur manque"
 
 #: ../IkiWiki/Plugin/sparkline.pm:115
 msgid "bad width value"
@@ -754,7 +762,7 @@ msgstr "Échec de la création de l'image à partir du code"
 
 #: ../IkiWiki/Plugin/websetup.pm:89
 msgid "plugin"
-msgstr "module complémentaire"
+msgstr "greffon"
 
 #: ../IkiWiki/Plugin/websetup.pm:108
 #, perl-format
@@ -771,17 +779,17 @@ msgstr "le fichier de configuration de ce wiki n'est pas connu"
 
 #: ../IkiWiki/Plugin/websetup.pm:256
 msgid "main"
-msgstr "principal"
+msgstr "Partie principale"
 
 #: ../IkiWiki/Plugin/websetup.pm:257
 msgid "plugins"
-msgstr "modules complémentaires"
+msgstr "greffons"
 
 #: ../IkiWiki/Plugin/websetup.pm:395
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
 msgstr ""
-"les changements de configuration ci dessous nécessitent une recompilation du "
+"les changements de configuration ci-dessous nécessitent une recompilation du "
 "wiki pour prendre effet"
 
 #: ../IkiWiki/Plugin/websetup.pm:399
@@ -789,7 +797,7 @@ msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
 msgstr ""
-"Pour que les changements de configuration ci dessous prennent effet vous "
+"Pour que les changements de configuration ci-dessous prennent effet vous "
 "devez recompiler le wiki"
 
 #: ../IkiWiki/Plugin/websetup.pm:433
@@ -803,6 +811,8 @@ msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
+"lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, "
+"activez le paramètre « allow_symlinks_before_srcdir »."
 
 #: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
@@ -810,9 +820,9 @@ msgid "skipping bad filename %s"
 msgstr "Omission du fichier au nom incorrect %s"
 
 #: ../IkiWiki/Render.pm:284
-#, perl-format
+#, fuzzy, perl-format
 msgid "%s has multiple possible source pages"
-msgstr ""
+msgstr "%s peut être associé à plusieurs pages source."
 
 #: ../IkiWiki/Render.pm:360
 #, perl-format
@@ -827,32 +837,32 @@ msgstr "Parcours de %s"
 #: ../IkiWiki/Render.pm:405
 #, perl-format
 msgid "rendering %s"
-msgstr "Affichage de %s"
+msgstr "Reconstruction de %s"
 
 #: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "rendering %s, which links to %s"
-msgstr "Affichage de %s, qui est lié à %s"
+msgstr "Reconstruction de %s, qui est lié à %s"
 
 #: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "rendering %s, which depends on %s"
-msgstr "Affichage de %s, qui dépend de %s"
+msgstr "Reconstruction de %s, qui dépend de %s"
 
 #: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "rendering %s, to update its backlinks"
-msgstr "Affichage de %s, afin de mettre à jour ses rétroliens"
+msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens"
 
 #: ../IkiWiki/Render.pm:498
-#, perl-format
+#, fuzzy, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr "Suppression de %s, qui n'est plus affiché par %s"
 
 #: ../IkiWiki/Render.pm:522
 #, perl-format
 msgid "ikiwiki: cannot render %s"
-msgstr "ikiwiki : impossible d'afficher %s"
+msgstr "ikiwiki : impossible de reconstruire %s"
 
 #. translators: The first parameter is a filename, and the second
 #. translators: is a (probably not translated) error message.
@@ -870,11 +880,11 @@ msgstr ""
 #: ../IkiWiki/Setup/Automator.pm:67
 #, perl-format
 msgid "unsupported revision control system %s"
-msgstr "Système de contôles des version non supporté"
+msgstr "Système de contrôle de version non reconnu"
 
 #: ../IkiWiki/Setup/Automator.pm:83
 msgid "failed to set up the repository with ikiwiki-makerepo"
-msgstr "Echec lors de la création du dépôt avec ikiwiki-makerepo"
+msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
 
 #: ../IkiWiki/Wrapper.pm:16
 #, perl-format
@@ -888,7 +898,7 @@ msgstr ""
 
 #: ../IkiWiki/Wrapper.pm:24
 msgid "wrapper filename not specified"
-msgstr "Le nom de fichier de l'enrobage n'a pas été indiqué"
+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.
@@ -914,8 +924,9 @@ msgid "usage: ikiwiki [options] source dest"
 msgstr "Syntaxe : ikiwiki [options] source destination"
 
 #: ../ikiwiki.in:14
+#, fuzzy
 msgid "       ikiwiki --setup configfile"
-msgstr ""
+msgstr "       ikiwiki --setup fichier de configuration"
 
 #: ../ikiwiki.in:90
 msgid "usage: --set var=value"
@@ -941,27 +952,25 @@ msgstr ""
 
 #: ../IkiWiki.pm:504
 msgid "cannot use multiple rcs plugins"
-msgstr ""
+msgstr "impossible d'utiliser plusieurs systèmes de contrôle des versions"
-"impossible d'utiliser plusieurs modules complémentaires dans le système de "
-"contrôle des versions"
 
 #: ../IkiWiki.pm:533
-#, perl-format
+#, fuzzy, perl-format
 msgid "failed to load external plugin needed for %s plugin: %s"
-msgstr ""
+msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
-msgstr "une boucle de pré traitement a été detectée sur %s à hauteur de %i"
+msgstr "une boucle de pré traitement a été détectée sur %s à hauteur de %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr "oui"
 
 #: ../auto.setup:16
 msgid "What will the wiki be named?"
-msgstr "Nom du wiki"
+msgstr "Nom du wiki :"
 
 #: ../auto.setup:16
 msgid "wiki"
@@ -969,15 +978,18 @@ msgstr "wiki"
 
 #: ../auto.setup:18
 msgid "What revision control system to use?"
-msgstr "Système de contrôle de version utilisé?"
+msgstr "Système de contrôle de version utilisé :"
 
 #: ../auto.setup:20
 msgid "What wiki user (or openid) will be wiki admin?"
-msgstr "Identifiant de l'administrateur?"
+msgstr "Identifiant de l'administrateur (utilisateur ou openid) :"
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
-msgstr "Nom de domaine du serveur HTTP?"
+msgstr "Nom de domaine du serveur HTTP :"
+
+#~ msgid "processed ok at %s"
+#~ msgstr "A été correctement traité à %s"
 
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Votre mot de passe vous a été envoyé par courriel."

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-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "ક્ષતિ"
 
@@ -89,8 +89,8 @@ msgstr "જુનું કરે છે %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "આના પર બરાબર છે %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -152,20 +152,20 @@ msgstr "મેઇલ મોકલવામાં નિષ્ફળ"
 msgid "Failed to delete file from S3: "
 msgstr "માપ બદલવામાં નિષ્ફળ: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -943,12 +943,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -972,6 +972,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "આના પર બરાબર છે %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "તમારો પાસવર્ડ તમને ઇમેઇલ કરવામાં આવ્યો છે."
 

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-17 21:55-0400\n"
+"POT-Creation-Date: 2008-10-19 20:06-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:1167
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182
 msgid "Error"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
 msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
@@ -172,9 +172,9 @@ msgid "automatic index generation"
 msgstr ""
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:329 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
-#: ../IkiWiki/Render.pm:151
+#: ../IkiWiki/Render.pm:149
 msgid "discussion"
 msgstr ""
 
@@ -318,11 +318,11 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:337 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:574
+#: ../IkiWiki/Plugin/inline.pm:572
 msgid "RPC::XML::Client not found, not pinging"
 msgstr ""
 
@@ -780,59 +780,59 @@ msgstr ""
 msgid "<p class=\"error\">Error: %s exited nonzero (%s)"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:255
+#: ../IkiWiki/Render.pm:253
 #, perl-format
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:279 ../IkiWiki/Render.pm:304
+#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:286
+#: ../IkiWiki/Render.pm:284
 #, perl-format
 msgid "%s has multiple possible source pages"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:362
+#: ../IkiWiki/Render.pm:360
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:402
+#: ../IkiWiki/Render.pm:400
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:407
+#: ../IkiWiki/Render.pm:405
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:428
+#: ../IkiWiki/Render.pm:426
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:449
+#: ../IkiWiki/Render.pm:447
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:488
+#: ../IkiWiki/Render.pm:486
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:500
+#: ../IkiWiki/Render.pm:498
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:524
+#: ../IkiWiki/Render.pm:522
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
@@ -926,12 +926,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1150
+#: ../IkiWiki.pm:1165
 #, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1659
+#: ../IkiWiki.pm:1674
 msgid "yes"
 msgstr ""
 

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-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Błąd"
 
@@ -92,8 +92,8 @@ msgstr "wygasający wpis %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "kanał RSS przetworzony w dniu %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -156,20 +156,20 @@ msgstr "Awaria w trakcie wysyłania wiadomości"
 msgid "Failed to delete file from S3: "
 msgstr "awaria w trakcie zmiany rozmiaru: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -970,12 +970,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, 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:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -999,6 +999,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "kanał RSS przetworzony w dniu %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Wiadomość z hasłem została wysłana."
 

po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Fel"
 
@@ -89,8 +89,8 @@ msgstr "låter %s gå ut"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "behandlad ok på %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -153,20 +153,20 @@ msgstr "Misslyckades med att skicka e-post"
 msgid "Failed to delete file from S3: "
 msgstr "misslyckades med att skriva %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -957,12 +957,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, fuzzy, perl-format
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -986,6 +986,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "behandlad ok på %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Ditt lösenord har skickats till dig via e-post."
 

po/vi.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-17 13:14-0400\n"
+"POT-Creation-Date: 2008-10-19 19:12-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:1166
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173
 msgid "Error"
 msgstr "Lỗi"
 
@@ -90,8 +90,8 @@ msgstr "đang mãn hạn %s"
 
 #: ../IkiWiki/Plugin/aggregate.pm:463
 #, perl-format
-msgid "processed ok at %s"
+msgid "last checked %s"
-msgstr "đã xử lý được ở %s"
+msgstr ""
 
 #: ../IkiWiki/Plugin/aggregate.pm:467
 #, perl-format
@@ -154,20 +154,20 @@ msgstr "Lỗi gửi thư"
 msgid "Failed to delete file from S3: "
 msgstr "lỗi ghi %s: %s"
 
-#: ../IkiWiki/Plugin/attachment.pm:48
+#: ../IkiWiki/Plugin/attachment.pm:49
 #, perl-format
 msgid "there is already a page named %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:81
+#: ../IkiWiki/Plugin/attachment.pm:82
 msgid "prohibited by allowed_attachments"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:189
+#: ../IkiWiki/Plugin/attachment.pm:190
 msgid "bad attachment filename"
 msgstr ""
 
-#: ../IkiWiki/Plugin/attachment.pm:231
+#: ../IkiWiki/Plugin/attachment.pm:232
 msgid "attachment upload"
 msgstr ""
 
@@ -958,12 +958,12 @@ msgstr ""
 msgid "failed to load external plugin needed for %s plugin: %s"
 msgstr ""
 
-#: ../IkiWiki.pm:1149
+#: ../IkiWiki.pm:1156
 #, 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:1658
+#: ../IkiWiki.pm:1665
 msgid "yes"
 msgstr ""
 
@@ -987,6 +987,9 @@ msgstr ""
 msgid "What is the domain name of the web server?"
 msgstr ""
 
+#~ msgid "processed ok at %s"
+#~ msgstr "đã xử lý được ở %s"
+
 #~ msgid "Your password has been emailed to you."
 #~ msgstr "Mật khẩu đã được gửi đính kèm thư cho bạn."
 

templates/change.tmpl

@@ -7,7 +7,6 @@
 [[!meta permalink="<TMPL_VAR PERMALINK>"]]
 </TMPL_IF>
 <div id="change-<TMPL_VAR REV>" class="metadata">
-<div class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
 <TMPL_LOOP NAME="PAGES">
@@ -28,7 +27,7 @@
 <span class="desc"><br />Commit type:</span>
 <span class="committype"><TMPL_VAR COMMITTYPE></span>
 <span class="desc"><br />Date:</span>
-<span class="changedate"><span class="date" title="<TMPL_VAR COMMITDATE_RAW>"><TMPL_VAR COMMITDATE></span></span>
+<span class="changedate"><TMPL_VAR COMMITDATE>
 </div>
 <div class=changelog>
 <TMPL_LOOP NAME="MESSAGE">

templates/inlinepage.tmpl

@@ -28,7 +28,7 @@
 <div class="inlinefooter">
 
 <span class="pagedate">
-Posted <span class="date" title="<TMPL_VAR CTIME_RAW>"><TMPL_VAR CTIME></span>
+Posted <TMPL_VAR CTIME>
 </span>
 
 <TMPL_IF NAME="TAGS">

templates/page.tmpl

@@ -112,7 +112,7 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <div class="pagedate">
-Last edited <span class="date" title="<TMPL_VAR MTIME_RAW>"><TMPL_VAR MTIME></span>
+Last edited <TMPL_VAR MTIME>
 <!-- Created <TMPL_VAR CTIME> -->
 </div>
 

underlays/javascript/ikiwiki.js

@@ -1,23 +1,38 @@
 // ikiwiki's javascript utility function library
 
-var hooks = new Array;
+var hooks;
+
+// Run onload as soon as the DOM is ready, if possible.
+// gecko, opera 9
+if (document.addEventListener) {
+	document.addEventListener("DOMContentLoaded", run_hooks_onload, false);
+}
+// other browsers
 window.onload = run_hooks_onload;
 
 function run_hooks_onload() {
+	// avoid firing twice
+	if (arguments.callee.done)
+		return;
+	arguments.callee.done = true;
+
 	run_hooks("onload");
 }
 
 function run_hooks(name) {
+	if (typeof(hooks) != "undefined") {
 		for (var i = 0; i < hooks.length; i++) {
 			if (hooks[i].name == name) {
 				hooks[i].call();
 			}
 		}
 	}
+}
 
 function hook(name, call) {
-	var h={name: name, call: call};
+	if (typeof(hooks) == "undefined")
-	hooks.push(h);
+		hooks = new Array;
+	hooks.push({name: name, call: call});
 }
 
 function getElementsByClass(cls, node, tag) {