--- builds_bin/functions	2010/03/02 21:16:48	1.7
+++ builds_bin/functions	2017/03/14 22:24:56	1.8
@@ -1,25 +1,35 @@
 #!/usr/bash
 
+strippo() {
+    msgcat --sort-by-file --width 80 --to-code UTF-8 $1 \
+    | sed '/^"\(Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language\|Language-Team\|X-Generator\):/d;0,/^msgid/{/^#/d}'
+}
+
+podiff() {
+    src=$1
+    dst=${2:-$(echo $1 | sed 's,/tmp/,/po/,')}
+
+    if [ "${src%%.pot}" != "$src" -o "${src%%.po}" != "$src" ]
+    then
+        diff --unified --label "$src" <(strippo $src) --label "$dst" <(strippo $dst)
+    elif [ "${src%%.tm}" != "$src" ]
+    then
+        diff --brief $src $dst > /dev/null
+    else
+        diff --unified $src $dst
+    fi
+}
+
 diffmv() {
     if [ ! -z "$1" -a ! -z "$2" ]
     then
         if [ -f "$2" ]
         then
-            if [ "${1%%.tm}" == "$1" ]
+            if podiff "$2" "$1"
             then
-                if diff -u "$2" "$1"
-                then
-                    /bin/rm -f "$1"
-                else
-                    /bin/mv -f "$1" "$2"
-                fi
+                /bin/rm -f "$1"
             else
-                if diff -q "$2" "$1" > /dev/null
-                then
-                    /bin/rm -f "$1"
-                else
-                    /bin/mv -f "$1" "$2"
-                fi
+                /bin/mv -f "$1" "$2"
             fi
         else
             /bin/mv -f "$1" "$2"
@@ -32,17 +42,9 @@ diffcp() {
     then
         if [ -f "$2" ]
         then
-            if [ "${1%%.tm}" == "$1" ]
+            if ! podiff "$2" "$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
+                /bin/cp -a "$1" "$2"
             fi
         else
             /bin/cp -a "$1" "$2"
@@ -81,14 +83,18 @@ xmltempl() {
 }
 
 anacondatmpl() {
+    content=""
+    if [[ "$1" == "sme8" ]];then
+         content="/var/lib/pootle/cvs/smeserver/cdrom.image/$1/updates/*.py  /var/lib/pootle/cvs/smeserver/cdrom.image/$1/*/installclasses/*.py"
+    fi
     xgettext -L python \
 	     -k=_ \
 	     -k=N_ \
 	     -o - \
 	     $(sed -n "/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/var/lib/pootle/cvs/smeserver/\2/$1/\2-*\3/\1@p" \
 		   /var/lib/pootle/cvs/smeserver/cdrom.image/$1/updates/README.txt) \
-	     /var/lib/pootle/cvs/smeserver/cdrom.image/$1/updates/*.py \
-	     /var/lib/pootle/cvs/smeserver/cdrom.image/$1/*/installclasses/*.py \
+		$content \
+    2> /dev/null \
     | sed 's@charset=CHARSET@charset=UTF-8@;s@Id-Version.*\\n@Id-Version: SME Template\\n@' \
     | sed 's@/var/lib/pootle/cvs/smeserver/[^/]\+/@@' \
     | msgcat -u \