updating trans
Merge branch 'hotfix/2013_06_20_finish_trans'