[Wesnoth-cvs-commits] wesnoth/utils po2po

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/09/04 12:34:30

Modified files:
        utils          : po2po 

Log message:
        fixed po2po to avoid missing messages, and avoid confusing cvs

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/utils/po2po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: wesnoth/utils/po2po
diff -u wesnoth/utils/po2po:1.4 wesnoth/utils/po2po:1.5
--- wesnoth/utils/po2po:1.4     Sat Sep  4 08:55:22 2004
+++ wesnoth/utils/po2po Sat Sep  4 12:34:30 2004
@@ -23,7 +23,7 @@
 for LANG in "$@"
 do
     # merge the 2 files
-    msgcat --use-first -F po/$LANG/$DSTDOMAIN.po po/$LANG/$SRCDOMAIN.po >$tmp
+    msgcat -F po/$LANG/$DSTDOMAIN.po po/$LANG/$SRCDOMAIN.po >$tmp
     mv po/$LANG/$DSTDOMAIN.po po/$LANG/$DSTDOMAIN.po.bak
     mv $tmp po/$LANG/$DSTDOMAIN.po
 
@@ -37,5 +37,8 @@
 
     touch -d '1970-01-02' po/$LANG/$DSTDOMAIN.po
     make -C po $LANG/$DSTDOMAIN.po
+
+    # make sure the timestamp is fixed or cvs gets confused
+    touch po/$LANG/$DSTDOMAIN.po
 done
 rm $tmp