diff options
author | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:26 +0200 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:25:26 +0200 |
commit | 0a8c2caf983d37f1a1a89325b320b788baf0e215 (patch) | |
tree | 3deaf3f54c981c8d8e55d19c17493b44a7a2da60 | |
parent | 8cc6d6048c842fda2158ba7a598ba192bb72a7b9 (diff) | |
parent | 5073631cd01fa3cbcd7d94c681b7b1bfa74363a8 (diff) |
Merge remote-tracking branch 'origin/libreoffice-3-4'
-rw-r--r-- | translations/makefile.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/translations/makefile.mk b/translations/makefile.mk index 9e720903ec1..229cfbb4a53 100644 --- a/translations/makefile.mk +++ b/translations/makefile.mk @@ -92,11 +92,7 @@ $(MISC)/sdf-l10n/%.sdf : $(MISC)/sdf-template/en-US.sdf sed -e "s/\ten-US\t/\tkid\t/" < $@.tmp > $@ rm -f $@.tmp .ELSE - $(PO2OO) -i $(PRJ)/source/$(@:b) -t $(MISC)/sdf-template/en-US.sdf -o $@ -l $(@:b) -# FIXME: waiting for fix of http://bugs.locamotion.org/show_bug.cgi?id=1883 -# po2oo --skipsource -i $(PRJ)/source/$(@:b) -t $(MISC)/sdf-template/en-US.sdf -o $@ -l $(@:b) - grep -v " en-US " $@ > $@.tmp - mv $@.tmp $@ + $(PO2OO) --skipsource -i $(PRJ)/source/$(@:b) -t $(MISC)/sdf-template/en-US.sdf -o $@ -l $(@:b) .ENDIF $(MISC)/merge.done : $(foreach,i,$(all_languages) $(MISC)/sdf-l10n/$i.sdf) |