[tx-robot] updated from transifex
Use do while
Merge branch 'master' into roster_sync

Conflicts:
	lib/och/push/get.php