[Wesnoth-cvs-commits] wesnoth/utils po2po

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/09/04 07:02:56

Modified files:
        utils          : po2po 

Log message:
        fixed for the new po layout

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

Patches:
Index: wesnoth/utils/po2po
diff -u wesnoth/utils/po2po:1.2 wesnoth/utils/po2po:1.3
--- wesnoth/utils/po2po:1.2     Fri Sep  3 09:16:47 2004
+++ wesnoth/utils/po2po Sat Sep  4 07:02:56 2004
@@ -23,17 +23,17 @@
 for LANG in "$@"
 do
     # merge the 2 files
-    msgcat --use-first -F po/$DSTDOMAIN/$LANG.po po/$SRCDOMAIN/$LANG.po >$tmp
-    mv po/$DSTDOMAIN/$LANG.po po/$DSTDOMAIN/$LANG.po.bak
-    mv $tmp po/$DSTDOMAIN/$LANG.po
+    msgcat --use-first -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
 
     # sync with DST pot
-    touch -d '1970-01-02' po/$DSTDOMAIN/$LANG.po
-    make -C po $DSTDOMAIN/$LANG.po
+    touch -d '1970-01-02' po/$LANG/$DSTDOMAIN.po
+    make -C po $LANG/$DSTDOMAIN.po
 
     # clear those obsolete strings added by SRC, but keep ours if any
-    msgattrib --no-obsolete po/$DSTDOMAIN/$LANG.po >$tmp
-    msgcat --use-first -F $tmp po/$DSTDOMAIN/$LANG.po.bak > 
po/$DSTDOMAIN/$LANG.po
+    msgattrib --no-obsolete po/$LANG/$DSTDOMAIN.po >$tmp
+    msgcat --use-first -F $tmp po/$LANG/$DSTDOMAIN.po.bak > 
po/$LANG/$DSTDOMAIN.po
 
     rm po/stamp-po 
     make -C po