--- builds_bin/functions	2009/03/05 19:32:51	1.5
+++ builds_bin/functions	2009/06/07 17:11:51	1.6
@@ -85,16 +85,22 @@ anacondatmpl() {
 	     -k=N_ \
 	     -o - \
 	     $(sed -n '/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/etc/pootle/cvs/smeserver/\2/sme7/\2-*\3/\1@p' \
-		   /etc/pootle/cvs/smeserver/cdrom.image/updates/README.txt) \
-	     /etc/pootle/cvs/smeserver/cdrom.image/updates/*.py \
-	     /etc/pootle/cvs/smeserver/cdrom.image/product/installclasses/*.py \
-    | sed 's@charset=CHARSET@charset=UTF-8@;s@[^ ]*/sme7/[^:]\+/\([^:]\+\):@updates/\1:@g;s@[^ ]*/cdrom.image/@@g;' \
-    | sed 's@Project-Id-Version.*\\n@Project-Id-Version: SME Anaconda\\n@' \
+		   /etc/pootle/cvs/smeserver/cdrom.image/sme7/updates/README.txt) \
+	     $(sed -n '/\.py/s@^\([^ \t]\+\)[ \t]\+\([^/]\+\)\(/.*\)\?@/etc/pootle/cvs/smeserver/\2/sme8/\2-*\3/\1@p' \
+		   /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/README.txt) \
+	     /etc/pootle/cvs/smeserver/cdrom.image/sme7/updates/*.py \
+	     /etc/pootle/cvs/smeserver/cdrom.image/sme7/product/installclasses/*.py \
+	     /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/*.py \
+	     /etc/pootle/cvs/smeserver/cdrom.image/sme8/updates/installclasses/*.py \
+    | sed 's@charset=CHARSET@charset=UTF-8@;s@Project-Id-Version.*\\n@Project-Id-Version: SME Anaconda\\n@' \
+    | sed 's@/etc/pootle/cvs/smeserver/[^/]\+/@@' \
     | msgcat -u \
 	     --use-first \
 	     - \
 	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme7/anaconda-*/po/anaconda.pot) \
 	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme7/anaconda-*/po/anaconda.pot) \
+	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme8/anaconda-*/po/anaconda.pot) \
+	     <(sed 's@CHARSET@UTF-8@' /etc/pootle/cvs/smeserver/anaconda/sme8/anaconda-*/po/anaconda.pot) \
     | sed '/Report-Msgid-Bugs-To/d;/POT-Creation-Date/d;/PO-Revision-Date/d;/Last-Translator/d;/Language-Team/d;/X-Generator/d;0,/^msgid/{/^#/d}' \
     | msgcat -F -t UTF-8 -
 }