Trebuchet: Refactor default translations

Change-Id: I35877bf255466081858489c6c495114f3fe4a91a
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1