[tx-robot] updated from transifex
Merge branch 'master' into mozilla_sync_1.2