aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2009-07-23 01:17:40 +0200
committerJonas Smedegaard <dr@jones.dk>2009-07-23 01:17:40 +0200
commit3bdc366e73c06d7d859facd460bcff660a6df4b3 (patch)
tree7deec08eb95506b6a3f3baeb6a6fcca3a578b953
parent30e122bfc808bdf8102e826b022b4faf1e8a7243 (diff)
parent44e72fab1db7e2a5b7419dea93a25793b27df951 (diff)
downloadikiwiki-3bdc366e73c06d7d859facd460bcff660a6df4b3.tar
ikiwiki-3bdc366e73c06d7d859facd460bcff660a6df4b3.tar.gz
Merge branch 'master' of git://git.ikiwiki.info
-rw-r--r--IkiWiki/Plugin/po.pm2
-rw-r--r--doc/ikiwikiusers.mdwn1
2 files changed, 1 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 22ad8a7f9..0ae4adcfc 100644
--- 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 56f407a41..72bdbf3d8 100644
--- 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/)