--- builds_bin/update_templates	2010/03/02 22:08:55	1.12
+++ builds_bin/update_templates	2010/04/08 20:03:57	1.14
@@ -93,7 +93,7 @@ for lang in $(ls -I templates /var/lib/p
 do
     # Create compendium to assist translations
     msgcat --use-first <(msgcat $(find /var/lib/pootle/tmp/errors/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
-                       <(msgcat $(find /var/lib/pootle/po/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
+                       <(msgcat --to-code UTF-8 $(find /var/lib/pootle/po/*/$lang/ -name '*.po') | msgattrib --translated --no-fuzzy) \
     > /var/lib/pootle/tmp/compendium-$lang.po
 
     # Use compendium to migrate each project to new template
@@ -106,14 +106,14 @@ do
 	# Ensure language is correct
         sed -i "/msgid \"en-us\"/{N;s@msgstr \"[^\"]*\"@msgstr \"$lang\"@}" /var/lib/pootle/tmp/$ver/$lang/* 2> /dev/null
 
+        # 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
+
 	# 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
 
         find /var/lib/pootle/tmp/$ver/$lang -type f | while read pkg
         do
-            # Set package name/version in new po files
-            [ "${pkg%%.po}" != "$pkg" ] && sed -i "/Id-Version:/{s@\(Version:\)[^\\]*@\1 SME $ver ($(basename $pkg))@;s@sme@Server @;s@contribs@Contribs @;}" $pkg
-
             # Move files that have changed
             diffmv $pkg $(echo $pkg | sed 's@/tmp/@/po/@')
         done