Merge commit 'jonas/master'

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 193cf0a543a24f05c5221eb1b8557d83ba38e98e..8f169fda59dff443e1189f49af52453d5fd7c641 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -828,7 +828,7 @@ sub refreshpofiles ($@) {
        foreach my $pofile (@pofiles) {
                IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
                if (-e $pofile) {
-                       system("msgmerge", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
+                       system("msgmerge", "--previous", "-q", "-U", "--backup=none", $pofile, $potfile) == 0
                                or error("po(refreshpofiles) ".
                                         sprintf(gettext("failed to update %s"),
                                                 $pofile));

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 56f407a41e8872625333ab243fbd2cc8ca9d0495..72bdbf3d832c9cbf6f0f776873cdc4c7e9823245 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -3,7 +3,6 @@ Projects & Organizations
 
 * [This wiki](http://ikiwiki.info) (of course!)
 * [Planet Debian upstream](http://updo.debian.net/)
-* The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
 * The [Sparse wiki](http://kernel.org/pub/linux/kernel/people/josh/sparse).
 * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/)