fixed for the new po layout
This commit is contained in:
parent
69160b3eb2
commit
587cf563d4
1 changed files with 7 additions and 7 deletions
14
utils/po2po
14
utils/po2po
|
@ -23,17 +23,17 @@ tmp=`tempfile`
|
|||
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
|
||||
|
|
Loading…
Add table
Reference in a new issue