urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.ikiwiki.info

master
Jonas Smedegaard 2009-07-23 01:17:40 +02:00
parent 30e122bfc8 44e72fab1d
commit 3bdc366e73
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/po.pm
View File

@ -828,7 +828,7 @@ sub refreshpofiles ($@) {
foreach my $pofile (@pofiles) { foreach my $pofile (@pofiles) {
IkiWiki::prep_writefile(basename($pofile),dirname($pofile)); IkiWiki::prep_writefile(basename($pofile),dirname($pofile));
if (-e $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) ". or error("po(refreshpofiles) ".
sprintf(gettext("failed to update %s"), sprintf(gettext("failed to update %s"),
$pofile)); $pofile));

1
doc/ikiwikiusers.mdwn
View File

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