--- builds_bin/update_templates	2008/07/08 13:58:19	1.1
+++ builds_bin/update_templates	2008/07/12 17:31:26	1.2
@@ -81,7 +81,8 @@ for lang in $(ls -I templates /etc/pootl
 do
     # Create error compendium to assist translators
     pocompendium -e errors-$lang.po -d /etc/pootle/po/sme*/$lang
-    sed -i '0,/^$/d' errors-$lang.po
+    sed -i '0,/^$/d;/^#~/d' errors-$lang.po
+    sed -i ':a;/^\n*$/{$d;N;ba;}' errors-$lang.po
     chmod 644 errors-$lang.po
     diffmv errors-$lang.po /var/www/html/errors/errors-$lang.po
 
@@ -140,7 +141,7 @@ do
     # Build console files
     pkgname=$(ls -d /etc/pootle/cvs/smeserver/smeserver-locale/*7/*/root | cut -d/ -f8)
     mkdir -p ${pkgname}.update/po/$lang
-    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed 's@\.pot@\.po@')
+    for pkg in $(ls /etc/pootle/po/sme7bc/templates/ | sed -n 's@\.pot@\.po@p')
     do
 	msgcat -F --no-wrap /etc/pootle/po/sme7bc/$lang/$pkg \
 	| grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
@@ -193,65 +194,3 @@ diff -ruN $orig $pkg.update/po \
 | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/po/.*\)@\1 \2@;/^diff -ruN/d' \
 >> /var/www/html/patches/$pkg-locale-$(date +%F).patch
 
-## cd /etc/pootle/tmp
-## 
-## # Build diffs for languages
-## rm -f /var/www/html/patches/smeserver-locale-all-*.patch /var/www/html/patches/contribs/*
-## for lang in $(ls /etc/pootle/po/sme7bp -I templates)
-## do
-##     # Remove previous patches
-##     rm -f /var/www/html/patches/smeserver-locale-$lang-*.patch
-## 
-##     # Build anaconda files
-##     mkdir -p /var/www/html/anaconda/sme7/$lang/LC_MESSAGES
-##     anacondagen sme7 $lang > /var/www/html/anaconda/sme7/$lang/LC_MESSAGES/anaconda.mo
-##     [ -s /var/www/html/anaconda/sme7/$lang/LC_MESSAGES/anaconda.mo ] || rm -rf /var/www/html/anaconda/sme7/$lang
-## 
-##     mkdir -p /var/www/html/anaconda/sme8/$lang/LC_MESSAGES
-##     anacondagen sme8 $lang > /var/www/html/anaconda/sme8/$lang/LC_MESSAGES/anaconda.mo
-##     [ -s /var/www/html/anaconda/sme8/$lang/LC_MESSAGES/anaconda.mo ] || rm -rf /var/www/html/anaconda/sme8/$lang
-## 
-##     # Build console diffs
-##     mkdir -p pootleupdate/po/$lang
-##     for pkg in $(ls /etc/pootle/po/sme7bc/templates/ -I anaconda.pot | sed 's@\.pot@\.po@')
-##     do
-## 	msgcat -F --no-wrap /etc/pootle/po/sme7bc/$lang/$pkg \
-## 	| grep -v 'Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|X-Generator' \
-## 	| sed '0,/msgid ""/{/^#/d}' \
-## 	> pootleupdate/po/$lang/$pkg
-## 	if [ -f /etc/pootle/cvs/smeserver/smeserver-locale/*/*/po/$lang/$pkg ]
-## 	then
-## 	    diff -u /etc/pootle/cvs/smeserver/smeserver-locale/*/*/po/$lang/$pkg pootleupdate/po/$lang/$pkg \
-## 	    | sed 's@/etc/pootle/cvs/smeserver/smeserver-locale/@@' \
-## 	    >> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-## 	else
-## 	    diff -u /dev/null pootleupdate/po/$lang/$pkg >> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-## 	fi
-##     done 
-## 
-##     # Build panel diffs
-##     mkdir -p pootleupdate/{$(localedir $lang general),$(localedir $lang userpassword),$(localedir $lang other)}
-##     for pkg in $(ls /etc/pootle/po/sme7bp/templates/ | sed 's@\.pot@@')
-##     do
-## 	match=$(find /etc/pootle/cvs/smeserver/ -type f -regex ".*/e-smith/locale/$lang/.*/$pkg")
-## 	xmlgen /etc/pootle/po/sme7bp/$lang/$pkg.po > pootleupdate/$(localedir $lang $pkg)/$pkg
-## 	diff -u ${match:-/dev/null} pootleupdate/$(localedir $lang $pkg)/$pkg \
-## 	| sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@' \
-## 	>> /var/www/html/patches/smeserver-locale-$lang-$(date +%F).patch
-##     done
-## 
-##     # Build contrib diffs
-##     for pkg in $(ls /etc/pootle/po/sme7cp/templates/ | sed 's@\.pot@@')
-##     do
-## 	match=$(find /etc/pootle/cvs/smecontribs/ -type f -regex ".*/e-smith/locale/$lang/.*/$pkg")
-## 	pkgname=$(find /etc/pootle/cvs/smecontribs/ -type f -regex ".*/e-smith/locale/en-us/.*/$pkg" | sed 's@.*/\([^/]\+\)/root/.*@\1@')
-## 	if [ ! -z "$pkgname" ]
-## 	then
-## 	    xmlgen /etc/pootle/po/sme7cp/$lang/$pkg.po > pootleupdate/$(localedir $lang $pkg)/$pkg
-## 	    diff -u ${match:-/dev/null} pootleupdate/$(localedir $lang $pkg)/$pkg \
-## 	    | sed 's@^\(---\|+++\) [^ ]\+/\([^/]\+/root/.*\)@\1 \2@' \
-## 	    >> /var/www/html/patches/contribs/$pkgname-locale-$(date +%F).patch
-## 	fi
-##     done
-## done
-## cat /var/www/html/patches/smeserver-locale-*-$(date +%F).patch > /var/www/html/patches/smeserver-locale-all-$(date +%F).patch