Merge branch 'release/0.5.1'

Conflicts:
	README.md

1 files changed, 15 insertions, 1 deletions

diff --git a/script/generate_pot.sh b/script/generate_pot.sh
index 0c5dfda36..f6c82dda7 100755
--- a/script/generate_pot.sh
+++ b/script/generate_pot.sh
@@ -1,8 +1,22 @@
 #!/bin/bash
 
+echo "This is NOT a completed script! Just use it as reference for what to do from the command line, or fix it until it works!"
+exit 1
+
 cd `dirname $0`
+# grab latest po files from Transifex
+tx pull -a -f
+git status | grep app.po | awk '{print $3}' | xargs git add
+git commit -m "Backup latest po files from Transifex"
 
+# now regenerate POT and PO files from Alaveteli source
 rake gettext:store_model_attributes
 rake gettext:findpot
 
-echo "Now commit the new app.pot and push.  See TRANSLATE.md for next steps"
\ No newline at end of file
+# upload the result to Transifex
+tx push -t 
+
+# re-download (it removes the fuzzy strings and normalises it to the format last committed)
+tx pull -a -f
+git status | grep app.po | awk '{print $3}' | xargs git add
+git commit -m "Updated POT"