--- builds_bin/update_templates	2010/03/02 21:16:48	1.11
+++ builds_bin/update_templates	2010/03/04 18:16:04	1.13
@@ -97,31 +97,27 @@ do
     > /var/lib/pootle/tmp/compendium-$lang.po
 
     # Use compendium to migrate each project to new template
-    for proj in $(ls -d /var/lib/pootle/po/{sme,contribs}[0-9]/$lang 2> /dev/null | sed 's@.*/\([^/]\+\)/[^/]\+$@\1@')
+    for ver in $(ls -d /var/lib/pootle/po/{sme,contribs}[0-9]/$lang 2> /dev/null | sed 's@.*/\([^/]\+\)/[^/]\+$@\1@')
     do
-        mkdir -p /var/lib/pootle/tmp/$proj/$lang
+        mkdir -p /var/lib/pootle/tmp/$ver/$lang
         pomigrate2 -F -C=/var/lib/pootle/tmp/compendium-$lang.po -q --locale=$lang \
-        /var/lib/pootle/po/$proj/$lang /var/lib/pootle/tmp/$proj/$lang /var/lib/pootle/po/$proj/templates > /dev/null
+        /var/lib/pootle/po/$ver/$lang /var/lib/pootle/tmp/$ver/$lang /var/lib/pootle/po/$ver/templates > /dev/null
 
 	# Ensure language is correct
-        sed -i "/msgid \"en-us\"/{N;s@msgstr \"[^\"]*\"@msgstr \"$lang\"@}" /var/lib/pootle/tmp/$proj/$lang/* 2> /dev/null
+        sed -i "/msgid \"en-us\"/{N;s@msgstr \"[^\"]*\"@msgstr \"$lang\"@}" /var/lib/pootle/tmp/$ver/$lang/* 2> /dev/null
 
-	# Generate translation memory for panels
-	updatetm --progress none -c 4 -i /var/lib/pootle/tmp/$proj/$lang -t /var/lib/pootle/tmp/compendium-$lang.po -o /var/lib/pootle/tmp/$proj/$lang
-    done
-done
+        # Set package version in po files
+        sed -i "s@\(Id-Version:\)[^\\]*@\1 SME $(echo $ver | sed 's@sme@Server @;s@contribs@Contribs @')@" /var/lib/pootle/tmp/$ver/$lang/*.po 2> /dev/null
 
-# Set package name/version in new po files
-for ver in 7 8
-do
-    find /var/lib/pootle/tmp/sme$ver/ -name '*.po' -printf "sed -i 's@Id-Version:[^\\\\]*@Id-Version: SME Server $ver (%f)@' %p\n" | sh
-    find /var/lib/pootle/tmp/contribs$ver/ -name '*.po' -printf "sed -i 's@Id-Version:[^\\\\]*@Id-Version: SME Contribs $ver (%f)@' %p\n" | sh
-done
+	# Generate translation memory for panels
+	updatetm --progress none -c 4 -i /var/lib/pootle/tmp/$ver/$lang -t /var/lib/pootle/tmp/compendium-$lang.po -o /var/lib/pootle/tmp/$ver/$lang
 
-# Move files that have changed
-for chk in $(find /var/lib/pootle/tmp/{sme,contribs}[0-9]/ -type f)
-do
-    diffmv $chk $(echo $chk | sed 's@/tmp/@/po/@')
+        find /var/lib/pootle/tmp/$ver/$lang -type f | while read pkg
+        do
+            # Move files that have changed
+            diffmv $pkg $(echo $pkg | sed 's@/tmp/@/po/@')
+        done
+    done
 done
 
 # Copy po files so we can create error reports