--- builds_bin/functions	2008/10/03 21:33:16	1.3
+++ builds_bin/functions	2009/03/02 22:08:07	1.4
@@ -3,40 +3,50 @@
 diffmv() {
     if [ ! -z "$1" -a ! -z "$2" ]
     then
-	if [ "${1%%.tm}" == "$1" ]
-	then
-	    if diff -u "$2" "$1"
-	    then
-		/bin/rm -f "$1"
-	    else
-		/bin/mv -f "$1" "$2"
-	    fi
-	else
-	    if diff -q "$2" "$1" > /dev/null
-	    then
-		/bin/rm -f "$1"
-	    else
-		/bin/mv -f "$1" "$2"
-	    fi
-	fi
+        if [ -f "$2" ]
+        then
+            if [ "${1%%.tm}" == "$1" ]
+            then
+                if diff -u "$2" "$1"
+                then
+                    /bin/rm -f "$1"
+                else
+                    /bin/mv -f "$1" "$2"
+                fi
+            else
+                if diff -q "$2" "$1" > /dev/null
+                then
+                    /bin/rm -f "$1"
+                else
+                    /bin/mv -f "$1" "$2"
+                fi
+            fi
+        else
+            /bin/mv -f "$1" "$2"
+        fi
     fi
 }
 
 diffcp() {
     if [ ! -z "$1" -a ! -z "$2" ]
     then
-	if [ "${1%%.tm}" == "$1" ]
-	then
-	    if ! diff -u "$2" "$1"
-	    then
-		/bin/cp -a "$1" "$2"
-	    fi
-	else
-	    if ! diff -q "$2" "$1" > /dev/null
-	    then
-		/bin/cp -a "$1" "$2"
-	    fi
-	fi
+        if [ -f "$2" ]
+        then
+            if [ "${1%%.tm}" == "$1" ]
+            then
+                if ! diff -u "$2" "$1"
+                then
+                    /bin/cp -a "$1" "$2"
+                fi
+            else
+                if ! diff -q "$2" "$1" > /dev/null
+                then
+                    /bin/cp -a "$1" "$2"
+                fi
+            fi
+        else
+            /bin/cp -a "$1" "$2"
+        fi
     fi
 }
 
@@ -117,7 +127,8 @@ xmlgen() {
     else
 	#lang=$(basename $(dirname $1))
 	msgcat -F $1 \
-	| perl -pe 's@<@_{_@g;s@>@_}_@g;s@&@_AMP_@g;s@\(n _}_ (\d+)\)@(n > $1)@' \
+	| perl -pe 's@<@_{_@g;s@>@_}_@g;s@&@_AMP_@g' \
+        | sed '/#,/d' | sed '1,/X-Generator/{;s,_{_,<,g;s,_}_,>,g;s,_AMP_,\&,g;}' \
 	| sed '/#,/d' \
 	| xml2po -m sme -p - /etc/pootle/templates/$(basename $1 | sed 's@\.pot\?$@@') \
 	| sed '1d' \