From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 22 Jul 2009 15:48:49 +0000 (+0200)
Subject: add --previous at bubulle's suggestion
X-Git-Tag: 3.15~114^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88d4fb15ba997e41f92b8d51079be4e3c5783474;p=ikiwiki.git

add --previous at bubulle's suggestion
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 193cf0a54..8f169fda5 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));